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

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



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