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

Change-Id: I8c25156e19ecedc73c92bde277366a2503e39e4b