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

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

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