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

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

Change-Id: Ie4565015fccd66a9f3f702498b115de7acde0602