[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: 20b53a76 am: d35e7a8a am: d7f38b21 -s ours am: c6066249 -s ours am: 68b9ceea -s ours

am skip reason: subject contains skip directive

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



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