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

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



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