Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7 am:...

Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7 am: c224482a am: 48a44019 am: d618fcc6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2514955



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