am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3