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

Change-Id: Ib919aae986834158b108cb5d2eaf55d174de6b20