[automerger skipped] Merge "Parcel only the canonical Uri.Part representation, not both." into qt-qpr1-dev am: 7a9c03e529 -s ours am: c3d7200b6a -s ours
am skip reason: Change-Id I2bc2008e49de5a66641ecdbd8e5354dfa647269d with SHA-1 c9afa38f97 is in history
Change-Id: Id90eef301cb325dcc772f6e81b0178601106fb58
This commit is contained in: