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

Change-Id: I2c912b8363a6ca8a12e1c56ae5f1956a4ba5dc07