[automerger skipped] Merge "Forward HAT and ConfirmationToken to TA on finish." am: da2f0ace am: 16232a17 -s ours am: 78ea82cb -s ours

am skip reason: Merged-In Ifb2b08514acab78ff3d4fec4bc928260820d4ce0 with SHA-1 94c4e237 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1754733

Change-Id: I049ad86d08d1f20370fe0748edffed3198b28ca8