Merge "Add individual sensor privacay states to sensor privacy api"