[automerger skipped] Add PowerSaveWhitelistExceptIdle as Optimizted modes condition am: e7cca4cd am: 803e3d71 -s ours

am skip reason: Merged-In I3cd10cf51b5132fc12a83e9554801ec4e8578cd1 with SHA-1 3f7839ca is already in history

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

Change-Id: I22cdb57241ad1a1b1e4a711e886bc891f058868d