Merge "This fixes the potential vts test failures for devices with no...

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: 2bb0aa10

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

Change-Id: I1601905b817536133df81f44b7f815b4050364a2