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

[automerger skipped] Merge "Visit Uris added by WearableExtender" into udc-dev am: f876f8eb am: 483bdf45 -s ours am: 937c9230 -s ours am: 42b4afa5 -s ours

am skip reason: Merged-In I0da18c631eb5e4844a48760c7aaedab715a0bfed with SHA-1 d770f706 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883969



Change-Id: I54632958b811fac70c3cea4d0367272ea090b81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>