Remove forced encryption

Change-Id: Id7cafbc8217713f825515f1b13f3cae8f2b5ea68
Merge "Remove forced encryption" into lollipop