Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
am: 4f86a894e1

Change-Id: I0947dbaa1eb840bffd7299d9fe8a9f6aea118a47