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: 9fea320f am: 164a2e13 am: 1ff1d353

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



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