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