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

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



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