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

[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: 369cc02a -s ours am: fce4ea47 -s ours

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

Change-Id: I90fc54bca44566b80ef6258a19e49a8b8e5ccb0e