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

* commit '2399df41360717017e06928c5d3f5857c94bb08c':
  Add support for KM_TAG_USER_SECURE_ID.