Merge "[automerger skipped] Merge "Visit Uris added by WearableExtender" into...

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