[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: Ib423738dd45a03502b5539a7c806701e8668b4ce
This commit is contained in: