Merge \"Merge \\\"Move legacy full disk encryption code to Settings.\\\" into...
Merge \"Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: 4401e24a am: 2cf5b73c\" into nyc-mr1-dev-plus-aosp
am: a8705f62
Change-Id: I538cd4562df5bba64337b66bb63b48b6b5425cc8