Merge "Ensure non-empty SvInfo is received" into sc-dev am: 5fb5afe8 am: 0bb1ef2e am: d8c550ef

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

Change-Id: I4652f2ecf0991a5dfcaadaed70cbc728aa46b2c2