[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for...

[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS."" into tm-dev am: d2f01b5a am: 9ef67a73 -s ours am: 03d63390 -s ours

am skip reason: subject contains skip directive

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



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