[automerger skipped] Merge "Add adaptive charging to the top level settings menu" into rvc-qpr-dev am: 4046f5c134
am: 07c98be876
-s ours
am skip reason: Change-Id Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9 with SHA-1 b60870cb7d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13287641
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4334a1cdf8988492abd999ade92da8fccdc9cb5a
This commit is contained in: