Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
am: b67ed25932" into rvc-d1-dev-plus-aosp am: 47a86f9fe4
Change-Id: I7ef3699a50468e6ef89c2563067151d2cba20ce2
This commit is contained in: