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

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



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