am d4b954f4: am caee73d3: (-s ours) am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev

* commit 'd4b954f4aaf0ce4d34698833c069fcdb999126ad':