Merge "[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock" into rvc-qpr-dev am: 1c687fa8ae

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

Change-Id: I4f52ea71bc393e1757c776440520937a616378b6