[automerger skipped] Merge "Avoid locking mChanges when not necessary" am: 6d66e48e am: 4f007c93 -s ours

am skip reason: Merged-In I193c8f0ce2659b89469bb21e505a6da382b64703 with SHA-1 58865c71 is already in history

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

Change-Id: I27e93e6e1cc0c97b7a709d7a0e802e6e32608124