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

Change-Id: Ic9b254f0f1b9ccf7253547b92e123e461c4eb465