Merge "Unregistering HIDL interfaces breaks VTS" into tm-dev am: b50f9aa1a9 am: d6274a5f52

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

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