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

Change-Id: Ie8690c9aa675fc06faec8b8da878030e1dccb4d7