Merge "Revert^2 "Update trusty to use secretkeeper hal V1"" into main am: 7e74ffd905

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

Change-Id: Ifd93c972c27f830defac8d1c90e46129c091aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>