Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback"...
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353 am: 33650f39
Change-Id: I492cddd4989b279b94ef051b7624e9a23603b7e6