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

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

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

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

Change-Id: Ib37708431d1a10a7783ccb052201fda7fb928e57