Merge change 10315

* changes:
  Fix typo in Javadoc for LocationManager.GPS_PROVIDER