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

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

Change-Id: I60ee4910f1f9ab9583ca19feabc293250b38b809