[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: d8c5ceba -s ours am: 3d62ac87 -s ours

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

Change-Id: I84e259eebe8e7cbe133883c81dddf3ac93a0f534