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