[manual merge] [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 93810ba1c0 -s ours am: aa7ae3a4c8 -s ours am: 3f522231cc -s ours am: 5cfd020d54 -s ours am: b6a236f4fe -s ours am: 6a56914706 -s ours

Change-Id: Ib7aea5696883e4b147f4dfa66c42f56c00042a19