Merge "Avoid media players inflations while changing orientation" into...

Merge "Avoid media players inflations while changing orientation" into tm-qpr-dev am: abbb1f83 am: 350e6595 am: 3cc7a63e

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



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