Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f616

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



Change-Id: I019a6b64bd482cbdfc15648a1dcdfd3648708519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>