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

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