[automerger skipped] Merge "Remove low ram carveout for encryption" into nougat-cts-dev am: 911759ccf5  -s ours skipped: c4da35b9c6 skipped: 5b6f3ef011 skipped: aea4887015 skipped: 43408ef7a0 skipped: 133de101dc am: ea077d4126
am: 5d20a8e02d

Change-Id: I05171612d08cd6dcd5addbfc18f31bfec3007784