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

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



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