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

Merge "Fix deadlock in reportMeasurement() and stop()" into sc-dev am: b56a2c1a am: 82903ff8 am: 54bab2ca

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

Change-Id: Ibb7db0f1c9ac53635badc3a7281b116a2ca891c7