Merge "Update subscription logic for VHAL ref impl." into tm-dev am: 9c15ed74 am: 14e21955

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



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