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

[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 skip reason: Merged-In I0da18c631eb5e4844a48760c7aaedab715a0bfed with SHA-1 3d36966e is already in history

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



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