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

Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6b am: cbd5c15f am: 69a3a68b am: 592be4a2 am: fe235e6a

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



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