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

Change-Id: I5035132d971ab163c20ad036851830d8abdc8137