Merge "Make Settings battery entries support dock charging" into tm-qpr-dev...

Merge "Make Settings battery entries support dock charging" into tm-qpr-dev am: 80e36dbb am: 4f2dfc5c

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



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