Merge remote-tracking branch 'goog/ub-launcher3-master' into temp

Test: make builds

Change-Id: I4e845aa51c9247328159e5aa0d95d425bffa435c
diff --git a/Android.bp b/Android.bp
index e132854..4265a44 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,6 +19,7 @@
         "androidx.test.runner",
         "androidx.test.rules",
         "androidx.test.uiautomator_uiautomator",
+        "androidx.preference_preference",
         "SystemUISharedLib",
     ],
     srcs: [