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

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

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



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