Merge "[hwtrust] Refactor session building process in cxxbridge" into main am: eac341c4bf Original change: https://android-review.googlesource.com/c/platform/tools/security/+/3444894 Change-Id: Ifca2acce8d4e75c863dbeaf40d5ba8c4ead1f3b1 Signed-off-by: Automerger Merge Worker <[email protected]>