Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7ad am: c224482a8a

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

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