Add location information from contact-info provider

Add City and/or Country information to the call, if that information
was surfaced by a caller-info provider

Change-Id: I58d860f1473430880ada943296108032e2f0c4cd
Issue-Id: OPO-712
(cherry picked from commit c9ec0e37)