Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5 -s ours am: 8704b90878 -s ours
am: a09731f592 -s ours
Change-Id: I463339937008747402cdbada4cb21d9cfbe41bf4
This commit is contained in: