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

* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings