Merge "Revert "Add user privacy sensitivity APIs."" into sc-dev