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

Merge "[automerger skipped] DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." am: 28428b73 am: 85c45c91 -s ours am: 0b8ee56a -s ours am: 2ab6f650 -s ours am: f44b7b5a -s ours am: 1a2f99d7 -s ours am: 6bdeda9e -s ours" into udc-qpr-dev am: 09ca6c17

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



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