am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '4c710cbe7f5786c3df396ea4283da920fd5c351b':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3