Merge "DO NOT MERGE Correct sensor privacy state if sensor privacy not supported" into tm-mainline-prod