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

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



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