Merge "Attempt to fix deadlock on saveOverrides" into sc-dev am: 782ede8c am: 8d066e09 am: e3851af2

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

Change-Id: I34c17e3f8e55e96f1b235af1946fd6d11be08f0a