[automerger skipped] Merge "[SettingsProvider] fix...

[automerger skipped] Merge "[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock" into rvc-qpr-dev am: 1c687fa8 am: bfb8bb6a -s ours

am skip reason: Change-Id I3bfbcf5a7b21f142fd00130e1a57232bc02aedb6 with SHA-1 69088854 is in history

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

Change-Id: I0840cd15bcd07e62f648c50a7b86bbf1c92c8757