am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
  Fix issue #23116383: Include security patch level in Settings