Merge "Add option for framework overlay to handle the GPS_PROVIDER in LocationManagerService."