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 am: 221d385f
Change-Id: Ia210245ea35453ff8970073f89f5f56e66e4a573