[automerger skipped] Merge "Avoid locking mChanges when not necessary" am: 6d66e48e52 am: 4f007c932a -s ours am: f5664a2cc2 -s ours
am skip reason: Merged-In I193c8f0ce2659b89469bb21e505a6da382b64703 with SHA-1 58865c7183 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737094
Change-Id: Ifd82ab37b7132ac1fdc9237d5e70e742dd062bdb
This commit is contained in: