Merge "Revert "[RILConstants] Add Location Privacy HAL""