diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index f1c13cf6ecd..72ea3122eb7 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -23,6 +23,7 @@
         <com.android.settingslib.widget.LayoutPreference
             android:key="apps_dashboard"
             android:layout="@layout/app_entities_header"
+            android:selectable="false"
             settings:allowDividerBelow="true" />
 
         <PreferenceCategory
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 0d5cca50f99..2d84e21e18f 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -27,6 +27,7 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.location.RecentLocationAccesses;
 import com.android.settingslib.widget.AppEntitiesHeaderController;
+import com.android.settingslib.widget.AppEntityInfo;
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.util.List;
@@ -90,7 +91,12 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
             int i = 0;
             for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) {
                 final RecentLocationAccesses.Access access = recentLocationAccesses.get(i);
-                mController.setAppEntity(i, access.icon, access.label, access.contentDescription);
+                final AppEntityInfo appEntityInfo = new AppEntityInfo.Builder()
+                        .setIcon(access.icon)
+                        .setTitle(access.label)
+                        .setSummary(access.contentDescription)
+                        .build();
+                mController.setAppEntity(i, appEntityInfo);
             }
             for (; i < MAXIMUM_APP_COUNT; i++) {
                 mController.removeAppEntity(i);