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

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

Change-Id: Ifa6e2d77e3948ac549efcb3dda35e0ecfb9ace4d