Android N MR2 Preview 2
cryptohome: Add a new flag and an error code for forcing new encryption.
am: e86bc673db

Change-Id: Ia721e92d0a2c4cf3612d2422b1c0613f669f0302