Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933

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

Change-Id: Ic9d497517b6778c413909917d485575a054dc331