Merge "Hook up blocked keys" into pi-dev

diff --cc src/com/android/settings/slices/SettingsSliceProvider.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index bb064d1,c1d87ed..df960d8
--- 1/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
--- 2/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@@ -35,8 -36,8 +36,9 @@@ import android.database.sqlite.SQLiteDa
  import android.net.Uri;
  import android.os.StrictMode;
  import android.provider.SettingsSlicesContract;
+ import android.util.ArraySet;
  
 +import com.android.settings.location.LocationSliceBuilder;
  import com.android.settings.wifi.WifiSliceBuilder;
  import com.android.settings.bluetooth.BluetoothSliceBuilder;
  import com.android.settings.notification.ZenModeSliceBuilder;