[DO NOT MERGE] Don't allow permission change to runtime am: fe430be9f1 am: 903102fa54 am: 33f5a3ccb3 am: 4682420d59 am: 52fc40c21c
am: 40d3de36ba  -s ours

Change-Id: If3a44c9e38ad8b5be61df8ab6d4086b14bc30d88