Merge changes from topic "vhal_sub_update" into tm-mainline-prod am: cf3d51d3

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



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