DO NOT MERGE suggest LocationRequest rather than Criteria

This is a cherry-pick of Ieb5ef28ab1e6b4b3c4d2b8ceb3a601083b4f8e2f
from master.

LocationProvider's javadoc suggests using Criteria instead of
LocationProvider, which is deprecated. Criteria is deprecated, too,
now, so we suggest LocationRequest instead.

Bug: 7434865
Change-Id: I00375a419c745bb46ff454bc5e4aa0bfac2b3fc3

Author: Victoria Lease

location/java/android/location/LocationProvider.java

@@ -33,8 +33,8 @@
  * Criteria} class allows providers to be selected based on
  * user-specified criteria.
  *
- * @deprecated Use the {@link Criteria} class to request location instead of
- * enumerating providers.
+ * @deprecated Use the {@link LocationRequest} class to request location
+ * instead of enumerating providers.
  */
 @Deprecated
 public class LocationProvider {