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 am: 116bc857 -s ours

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

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



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