Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1

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

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