Merge "Merge "Update string to Android security update" into rvc-dev am: f10afc071f
am: 0affb4891f" into rvc-d1-dev-plus-aosp am: 313d455754
am: 5a1728cdc2
Change-Id: I99efee5b5a465c4a3295f5c769c4573e4d62bac4
This commit is contained in: