Merge "This fixes the potential vts test failures for devices with no registered shared secret services. It aso fixes the static dependency issue. Test: atest VtsAidlSharedSecretTargetTest, atest VtsAidlSecureClockTargetTest Bug: b/182913582" am: 2bb0aa102d am: 3e2f2fa52e am: e21d0c5b49

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1642747

Change-Id: Ia2e674e3c23f24f80fe71a6aa9e01a0215120567