Merge "Fix deadlock in reportMeasurement() and stop()" into sc-dev am:...

Merge "Fix deadlock in reportMeasurement() and stop()" into sc-dev am: b56a2c1a am: 89344ea1 am: b43f0061

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

Change-Id: I667837f73b5c77de38a33b0a9955678d8ed0eae3