Merge changes from topic "am-aca13833ae084f9db376a5772c91ec4b" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into tm-qpr-dev am: e8807ca1 -s ours am: 00ac5ff8 -s ours am: 617e6334 -s ours am: 58e71fcc -s ours
  [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 60a0e4f1 -s ours am: b6b0c509 -s ours am: 40635b08 -s ours am: 5799af06 -s ours