[automerger skipped] Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4
am: 63a22fd735
am: e1740e2faa
-s ours
am skip reason: Merged-In I0901c56ae93691c984376852da78cde9078caaf0 with SHA-1 0849672890
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143
Change-Id: I978729682e0c229028f97b979ae319480e418570
This commit is contained in: