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

Change-Id: I7c41e88f49738d927a5c0233b9702b36d2ca7282