[automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into tm-dev am: 4c6ffbb80c -s ours am: 044fc9a6b9 -s ours

am skip reason: Merged-In I6f4d2a35e89bbed7bd9e07bf5cd3e2d68b20af9a with SHA-1 73fa082a72 is already in history

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

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