Merge "DO NOT MERGE: Don't do heavy operation while in the synchronized block"...

Merge "DO NOT MERGE: Don't do heavy operation while in the synchronized block" into tm-dev am: 2f056bb1

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



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