[automerger skipped] Merge "Proper PendingIntent.queryIntentComponents...

[automerger skipped] Merge "Proper PendingIntent.queryIntentComponents implementation" into tm-dev am: eba590b2 am: 02ddf858 -s ours am: 514a247b -s ours am: a4dbeb64 -s ours am: a86dfbdc -s ours am: 4fb75445 -s ours

am skip reason: Merged-In Ib4e1c04c8de4e9bcee35d584dfb213954ec65449 with SHA-1 6110caff is already in history

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



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