am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '2be290cf36f06da260e67b430a625422da512609':
  Fix issue #23116383: Include security patch level in Settings