Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly...
Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da30 am: 0f53058f am: c4292299
Change-Id: I4dc20ce76e7766f33aae2f2c664763c55f56fce2