Merge "Add STORAGE_KEY tag to keymaster 4.1"