Merge "Revert "Re-land "Enable LOCAL_LAYOUT""" into tm-qpr-dev am: 52c3498a

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



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