[automerger skipped] Merge "Deprecates GET_INTENT_FILTERS in the...

[automerger skipped] Merge "Deprecates GET_INTENT_FILTERS in the PackageManager" am: cba3b817 am: a81e3c0f am: 97bf010b -s ours am: 057ad74f -s ours

am skip reason: Change-Id I907077b2a07e4a88aa8994ed3c25991b6d1172b4 with SHA-1 940cd5ae is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3a92ec96a3c640a5a607b78ed854c5b65ebd267