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

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

Change-Id: I2320b7ee5b55a8f78ae05f8f352d1a4d82c0826b