Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0