Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
am: 25a263a303

Change-Id: If35b625802224f7f1dbfb24d83e469093bdc718b