Merge "Add android.frameworks.sensorservice to system/manifest.xml"