[automerger skipped] Merge "[Dagger] Remove ConfigurationController from...

[automerger skipped] Merge "[Dagger] Remove ConfigurationController from BatteryMeterView." into sc-v2-dev am: df4f102c am: 32f9e52c -s ours

am skip reason: Merged-In If8ef375445e75323c5be35e4b827493fb0f7ef94 with SHA-1 cb55dcf6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362950

Change-Id: I3dae403750fa5fc7cd7b41bb748ce3bad906861b