Merge "Fix VTS SensorsHidl Test Failures" am: 98e36a4ca8

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

Change-Id: Ic10dcdddf13819ce09cdfc916534cbca8d55baa5