am 9f7ad8fe: am 28594929: am 7fd06374: (-s ours) Fix possible race condition in Sensor CTS framework.

* commit '9f7ad8fe464e496338a8c15d2702a849b34035ff':