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

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

Change-Id: Ifc3948b5c9af3f106da454e80b69d229af2ed40a