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

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

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