Merge "Fix wired charging ripple not showing up in multi-user mode." into...

Merge "Fix wired charging ripple not showing up in multi-user mode." into tm-qpr-dev am: 85d8bd06 am: 2a71648c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21233911



Change-Id: I63342268c62e36a081bde4231a79b90775cfcd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>