Merge "Play charging feedback on a background thread" into tm-dev am:...

Merge "Play charging feedback on a background thread" into tm-dev am: b89dd9bc am: b32d895c am: 04342fc4

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



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