Fix issue #23116383: Include security patch level in Settings

Change-Id: I003564376a02a70f0245353472544cde355240ac
3 files changed