Merge "Fix wrong logic in macro key handling." into udc-dev am: cf6e3b1f am: aee1e356

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



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