Merge "Re-land "Enable LOCAL_LAYOUT"" into tm-qpr-dev am: b3c6384d am: bcac7745

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



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