Merge "Draw percentage information into BatteryChartView manually" into sc-dev am: f634831de7

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

Change-Id: I9afea9281b763fba993d7f4ce2d708a6ae75289a