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: c9b2238e am: 6babed39

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



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