Merge "Fix checkKeyIntentParceledCorrectly's bypass" into tm-dev am: 176d76f1a6

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

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