[automerger skipped] Simplify config changes and request media host layout...

[automerger skipped] Simplify config changes and request media host layout updates am: 73bf6685 am: 211f5ce1 -s ours am: c1e4d096 -s ours am: 5cc6d575 -s ours

am skip reason: Merged-In I5b34ba85e98b4fbf8fe3b24893d0423146aa5f75 with SHA-1 48cd3b60 is already in history

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



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