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

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



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