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

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



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