[automerger skipped] Merge "DO NOT MERGE: Don't do heavy operation while in...

[automerger skipped] Merge "DO NOT MERGE: Don't do heavy operation while in the synchronized block" into tm-dev am: 2f056bb1 am: 1412cd90 -s ours

am skip reason: subject contains skip directive

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



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