Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev...
Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: f8c64089 am: 5b9fab40
am: d2effc7c
Change-Id: I850ad5971e802d876bf38ca9a5d4ab752399cdbb