Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62

Change-Id: I1ee8f687385bb2d5026f6bee351008ee8704ae82