Merge "qseecom: change key management api to support tz with SSD key store"