Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab

Change-Id: Ie8a5c1fd84140ac876e1a1efb77596ea07a2fd46