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
am: 08a56523cb

Change-Id: Ie01815247495e23a815b32f33bff9b30aed54e83