Merge "[1/4] Add user customizable MACRO_x keys in frameworks" into udc-dev am: a2e66c94 am: d516bfc5

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



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