Merge "Merge "Attempt to fix deadlock on saveOverrides" into sc-dev am: 782ede8c am: 6619740e" into sc-v2-dev-plus-aosp am: 18854aba

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

Change-Id: I056b03e80cedca4d157b98fa9a80fbd05579c166