Merge "Simplify config changes and request media host layout updates" into...

Merge "Simplify config changes and request media host layout updates" into tm-qpr-dev am: b5706956 am: 5ce69faf

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



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