[automerger skipped] Merge "Add STORAGE_KEY tag to keymaster 4.1" am: 9498310c3d am: 4ae48e66a6 am: 27ffb58396 -s ours
am skip reason: Change-Id I5f7f83755fcbed96d8f38fa51812aa6d2eb0927b with SHA-1 9bc9059842 is in history

Change-Id: Ia507172b2ed718a76fa8abe01a2c6fbc695949b8