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

[automerger skipped] Merge "Proper PendingIntent.queryIntentComponents implementation" into tm-dev am: eba590b2 am: b49b2caa -s ours am: 4f1aada8 -s ours am: fea66f88 -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: I1f6593592fc8a85fbe472cbcdf4485a2e74daeac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>