am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev

* commit '6ff3e53faaab66975674e16a1822d926c529bc5d':
  Fix issie #23116383: Include security patch level in Settings