Merge "Add STORAGE_KEY tag to keymaster 4.1" am: 9498310c3d am: 4ae48e66a6

Change-Id: Icf8a51ca3991686185beb83198ac4d8ceed58fa3