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

Change-Id: I3d3dbcf2efe21edabb63d7e071f54920e993683a