Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792

src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java

@@ -117,6 +117,12 @@ public class LocationTimeZoneDetectionPreferenceController
         return false;
     }
 
+    @Override
+    public int getSliceHighlightMenuRes() {
+        // not needed since it's not sliceable
+        return 0;
+    }
+
     @Override
     public int getAvailabilityStatus() {
         TimeZoneCapabilities timeZoneCapabilities =