Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am:...

Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4 am: 2150660d am: ff067bcc am: 6d7a8f32

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



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