Merge "Don't use cached app icon in app info page." into pi-dev am: 7312f55549

am: 9b8684fd12

Change-Id: I99e6bf942928fe64595c1eba03c3099910fc0545

diff --cc src/com/android/settings/widget/EntityHeaderController.java
index 05d2be1,5bf0e4c..6f46f1d
--- 1/src/com/android/settings/widget/EntityHeaderController.java
--- 2/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@@ -31,10 -31,11 +31,11 @@@ import android.graphics.drawable.ColorD
  import android.graphics.drawable.Drawable;
  import android.os.Bundle;
  import android.os.UserHandle;
 -import android.support.annotation.IntDef;
 -import android.support.annotation.VisibleForTesting;
 -import android.support.v7.widget.RecyclerView;
 +import androidx.annotation.IntDef;
 +import androidx.annotation.VisibleForTesting;
 +import androidx.recyclerview.widget.RecyclerView;
  import android.text.TextUtils;
+ import android.util.IconDrawableFactory;
  import android.util.Log;
  import android.view.LayoutInflater;
  import android.view.View;

diff --cc tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index 44d355c,cdc17ae..d6f7960
--- 1/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
--- 2/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@@ -52,9 -56,8 +55,10 @@@ import org.mockito.Answers
  import org.mockito.Mock;
  import org.mockito.MockitoAnnotations;
  import org.robolectric.RuntimeEnvironment;
+ import org.robolectric.annotation.Config;
  
 +import androidx.preference.Preference;
 +
  @RunWith(SettingsRobolectricTestRunner.class)
  public class EntityHeaderControllerTest {