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

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

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



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