am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings