am 416605e4: (-s ours) am fc81be94: Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev

* commit '416605e450b4caa6988ea6feeae89305a1e822fb':