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

Change-Id: I015615df364706be928680209135cc3f23aed8f7