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

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

Change-Id: I19afe89350dd1428207a3eb8f2291c7ee6f1fe80