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

Change-Id: I3bfc8538811030346ae514f568f85d4aa51562d9