resolve merge conflicts of 92f7794d90 to master

Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af

diff --cc src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index f1568fe,82bef2d..0650d5b
--- 1/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
--- 2/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@@ -72,6 -70,6 +72,7 @@@ import org.mockito.MockitoAnnotations
  import org.robolectric.RuntimeEnvironment;
  import org.robolectric.annotation.Config;
  
++import java.time.LocalDateTime;
  import java.util.ArrayList;
  import java.util.List;