Merge "Fix checkKeyIntentParceledCorrectly's bypass" into rvc-dev am:...

Merge "Fix checkKeyIntentParceledCorrectly's bypass" into rvc-dev am: 82a8fddc am: 7952c93b am: 1378c59b

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



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