Merge "[automerger skipped] Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da30 am: 0f53058f am: c4292299 am: 7c6eadea -s ours" into rvc-qpr-dev-plus-aosp am: d0eee4d4 -s ours

am skip reason: Change-Id I2e2ccaf38ef6bd558b4b02e647a7e263c7e612a9 with SHA-1 1f31f3ee is in history

Change-Id: I229e302aff7925c1b4541a93d5a24701297ede08