Merge "Fix checkKeyIntentParceledCorrectly's bypass" into tm-dev am: 176d76f1 am: 441a1463

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



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