[automerger skipped] Merge "Verify URI permissions for...

[automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into tm-dev am: 97084e84 am: 131135f4 -s ours am: 23a021e4 -s ours am: bbc2b4db -s ours

am skip reason: Merged-In Ib363110fd2bdcf4d9974fde5f78df926940785bf with SHA-1 a95dca8d is already in history

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



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