[automerger skipped] Merge "Deprecates GET_INTENT_FILTERS in the PackageManager" am: cba3b81738 am: a81e3c0ffc am: 97bf010bc1 -s ours am: 057ad74f9e -s ours am: 891dab01a7 -s ours
am skip reason: Change-Id I907077b2a07e4a88aa8994ed3c25991b6d1172b4 with SHA-1 940cd5ae33 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473222
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59b0aedfb38adcd1c6d462d523749c191a438dca
This commit is contained in: