Merge "[Security] resolve overlay attack on RequestIgnoreBatteryOptimizations" into sc-v2-dev am: d24f289548 am: e401e37369

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

Change-Id: I750731ab9eb4bc063b33b2ca4c80999f5544b64f