Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: 648266e8d7
am: 8aad80fe7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142 Change-Id: I2ad446b943e9c374b0fb7e7539aad26f421f9945 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: