[automerger skipped] Merge "Revert "Add PowerSaveWhitelistExceptIdle as...

[automerger skipped] Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev am: 57919fbc am: 40f8910e -s ours

am skip reason: Merged-In I3b1850ab66bbf4cd605f14152a244a8ed7edd578 with SHA-1 2146a873 is already in history

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

Change-Id: I5b6a7e24b28f1e0335317c1d20041228841f6daa