Merge "Unregistering HIDL interfaces breaks VTS" am: 1ce1833fc8

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

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