tree fbb0f18b72dc8626f8d88a887e41ad2502eebf14
parent 254369967aa7153eff96a819126bfbc1c193ba6d
parent e62d479921fe4866851fb5e5f538e9edca15438a
author Jeff Sharkey <jsharkey@android.com> 1507755591 +0000
committer android-build-merger <android-build-merger@google.com> 1507755591 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee
am: e62d479921  -s ours

Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257