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

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