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

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

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