Merge "qseecom: add support to clear key for per file encryption"