[DO NOT MERGE] Don't allow permission change to runtime am: fe430be9 am: 903102fa am: 33f5a3cc am: 4682420d Change-Id: I2855b5a4f566006fe08eac46b9eb78a8662c915e