Merge "Keystore 2.0: Remove list permission from keystore2_key security class."