Merge "Add getCurrentLocation API to LocationManager"