[automerger skipped] Merge "[QPR1][Security] Fix...

[automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943 am: ca8e67d1 -s ours

am skip reason: Merged-In Ia2e47c493c206e96b0bc1d9f08735c0f9474c233 with SHA-1 55890075 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897

Change-Id: Ic02568f9af4ec588193c180c5dda86d679b42c3c