Merge "Use MediaPlayer in a background thread." into tm-dev am: a7358c9d am: 5b34e393

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



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