Merge "Unregistering HIDL interfaces breaks VTS" into tm-dev am: b50f9aa1a9 am: d6274a5f52 am: 65349b0cf8 am: 11b61cbae6

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

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