Merge "[location] system_server should not call non forUser Settings.Secure.get* methods"

import static com.android.server.location.LocationManagerService.TAG;

import android.app.ActivityManager;

import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.net.Uri;

    @Override

    public float getCoarseLocationAccuracyM() {

        long identity = Binder.clearCallingIdentity();

        final ContentResolver cr = mContext.getContentResolver();

        try {

            return Settings.Secure.getFloat(

                    mContext.getContentResolver(),

            return Settings.Secure.getFloatForUser(

                    cr,

                    LOCATION_COARSE_ACCURACY_M,

                    DEFAULT_COARSE_LOCATION_ACCURACY_M);

                    DEFAULT_COARSE_LOCATION_ACCURACY_M,

                    cr.getUserId());

        } finally {

            Binder.restoreCallingIdentity(identity);

        }