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

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



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