FPII-1920:DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
(cherry picked from commit 6ceb2ba9b8928b33c30e0c639539c3fe2f27971e)
3 files changed