Merge "Play charging feedback on a background thread" into tm-dev am: b89dd9bc am: 114ab61c

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



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