[automerger skipped] Merge "Wrap ShortcutQuery in a parcelable wrapper object...

[automerger skipped] Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da30 am: 0f53058f am: 99ce1fd0 am: 6784ec00 -s ours

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

Change-Id: Ib6b16a7067e824e4e66ddaf4d284a6e774ae9119