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

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



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