[automerger skipped] Merge "Fix deadlock on CompatConfig.mChanges" into sc-dev...

[automerger skipped] Merge "Fix deadlock on CompatConfig.mChanges" into sc-dev am: 1f7b6f2e -s ours am: c27143ec -s ours

am skip reason: Merged-In I72b23fb4651c6efece0afb53b5dc4ca8df63dddb with SHA-1 da0913d1 is already in history

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

Change-Id: Ida2abc0f13085c3edab60f08352f2cd8c074b253