Merge "Keystore 2.0: sepolicy changes for vold to use keystore2"