Merge "Fix VTS SensorsHidl Test Failures" am: 98e36a4ca8 am: fadbaf00f9 am: 5e00533a44

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

Change-Id: Ic894f642521adfa860ffed50b55521cf6215c727