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: 70215248
Change-Id: I122499b6d4bccf7ece08039abc02a1a5dedc9e9a