Merge "Fix potential deadlock with SensorObserver." into sc-v2-dev am: f00f998eb0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16476805

Change-Id: I7eca194a94e2038f587cc66e51af1d0d9054b054