Merge "Add a new config for checking BatteryManager show/hide rule" into...

Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e55 am: e784c520

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



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