[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: a22a62f5 am: 262a4e60 -s ours

am skip reason: subject contains skip directive

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



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