[automerger skipped] Merge "Enhance battery settings limit charge tip" into...

[automerger skipped] Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728 am: 88cd5025 -s ours am: 82203dc6 -s ours

am skip reason: Merged-In I0901c56ae93691c984376852da78cde9078caaf0 with SHA-1 083ace54 is already in history

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

Change-Id: I21254dae35228d8b1d2cb4650e175aa50275fc0d