Merge changes from topic "am-b0d172e19d1f49a69f84608c9f03128c" into udc-qpr-dev-plus-aosp

* changes:
  Merge "[automerger skipped] Merge "Visit Uris added by WearableExtender" into rvc-dev am: 34523984 am: d013fed9 -s ours am: 56cbe2e1 -s ours am: 6df15797 -s ours am: 35e0d9d4 -s ours am: 39aa5318 -s ours am: 320e5fb9 -s ours am: 52414868 -s ours am: 6630fee3 -s ours" into udc-d1-dev-plus-aosp am: 116bc857 -s ours
  [automerger skipped] Merge "Visit Uris added by WearableExtender" into rvc-dev am: 34523984 am: d013fed9 -s ours am: 56cbe2e1 -s ours am: 6df15797 -s ours am: 35e0d9d4 -s ours am: 39aa5318 -s ours am: 320e5fb9 -s ours am: 52414868 -s ours am: 6630fee3 -s ours am: c6ab679e -s ours