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: 8249d603 am: 4528b1b7

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



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