[automerger skipped] Merge "Fix import of anyLong in...

[automerger skipped] Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev am: 5ab0a976 -s ours am: b88e71b1 -s ours

am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69f is already in history

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



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