Merge "[automerger skipped] Merge "Parcel only the canonical Uri.Part...

Merge "[automerger skipped] Merge "Parcel only the canonical Uri.Part representation, not both." into qt-qpr1-dev am: 7a9c03e5 -s ours am: c3d7200b -s ours am: d8c5ceba -s ours" into rvc-d1-dev-plus-aosp am: 5e5a4c98 -s ours

am skip reason: Change-Id I2bc2008e49de5a66641ecdbd8e5354dfa647269d with SHA-1 f35f2913 is in history

Change-Id: I516d2719b1fea1b88a4ba0da8e018e75b50887de