Cleanup code around recording method trace events am: d265a80f86 am: 463ff4e09f am: b33b8b87b6

Original change: https://android-review.googlesource.com/c/platform/art/+/2411662

Change-Id: Id5a187fb3e80d21513e87ab2caa29a68b3ebcf23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>