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

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

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