Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c183880 am: 4f3e5c3a

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



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