* fix conflict

* fix conflict

* fix code

cherry pick encryption api
Co-authored-by: NYanghello <915769235@qq.com>
Co-authored-by: NYanghello <yangqingyou@baidu.com>