Merge "Move list permission from keystore2_key to keystore class."