Merge "Ensure non-empty SvInfo is received" into sc-dev am: 5fb5afe821

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

Change-Id: I6fb65f20217e111302c8176bbc6398c87a91e19d