Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: dda7021b4b

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

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