Merge changes from topic "cherrypicker-L33700000962584268:N96700001396822390" into main

* changes:
  ARC: Follow-up fix AndroidLint error
  ARC: Show location services setting in ARC-T

src/com/android/settings/location/LocationServicesPreferenceController.java

@@ -32,7 +32,7 @@ public class LocationServicesPreferenceController extends BasePreferenceControll
 
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
+        return mContext.getResources().getBoolean(R.bool.config_show_location_services)
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }