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

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



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