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

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

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



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