Merge "Add adaptive charging to the top level settings menu" into rvc-qpr-dev am: 4046f5c1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie23c4efbf1923e89c4f077decb397251f6c70f28