Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev