Merge "Wait for all results to come before return." into main am: deb05c9993 am: 66bf77526f

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

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