am ad00b313: am ffeb2959: am 036cb573: am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev

* commit 'ad00b3137a9c982030caf42ec48fb828b40b2e19':
  Protect against lack of WRITE_SYSTEM_SETTINGS AppOp