Merge "DO NOT MERGE: Don't do heavy operation while in the synchronized block" into tm-dev am: 2f056bb150
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17701597 Change-Id: I9fbb7b7ec50aba0bff41c98ac1e9c7d649fd652e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: