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

Change-Id: I5f9c2bd4ce2d1a8a19c4341a0590625cff072c01