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

* commit '897f3ba8b1cc402fca16720be345ba9c587c326b':
  Fix issie #23116383: Include security patch level in Settings