Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am: c8dac8d6f6 am: 84e1238ed6
am: cc0ec4d292

Change-Id: Ic65e41e08606715cbbd953b77ef4066a8e047a7f