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

Change-Id: I597b43bb7218779d55c0b11af79daef128d199f2