Merge "Reorder media players when orientation changes" into tm-qpr-dev am:...

Merge "Reorder media players when orientation changes" into tm-qpr-dev am: b4abaa6b am: 5068cb17

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



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