Merge "Fix foreground importance bug in LocationManagerService." into oc-dev