[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

Change-Id: Ia8367ea8c956f87db692eea43a470268dc56088d