am 428427d2: am 2399df41: Merge "Add support for KM_TAG_USER_SECURE_ID."

* commit '428427d292a2a5e1b6b11e76063f719ea4cd1451':
  Add support for KM_TAG_USER_SECURE_ID.