Merge "Unregistering HIDL interfaces breaks VTS" into tm-dev am: b50f9aa1a9 am: 8cd8f2080a am: b32335919d

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

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