Merge "Fix permanent denial of service via apis with illegal intent filter" into tm-qpr-dev am: 2e8ec83590

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

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