Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc

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

Change-Id: I3d91b11afeb397e7bddea0b82d0cfe4d2faafece