Merge "Revert "Enable LOCAL_LAYOUT"" into tm-qpr-dev am: 7cacd12b

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



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