Merge "Revert "Update trusty to use secretkeeper hal V1"" into main am: 5a964ac084 am: 55af887540

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

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