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

Change-Id: I8b9be13d5928f2a9221c08a5801b8a3b4f7f4fe0