Merge "Fix potential trace{Begin, End} mis-match issues in IMMS" into udc-dev am: da896af6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21507352



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