Merge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa

am: ec8007b426

Change-Id: I118fee2b974a0815d21d422358250281da9804f0

diff --cc src/com/android/settings/applications/InstalledAppDetails.java
Simple merge

diff --cc src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index dc0730e,deef5e0..8fb1e99
--- 1/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
--- 2/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@@ -55,10 -44,10 +55,11 @@@ import com.android.settings.SettingsAct
  import com.android.settings.TestConfig;
  import com.android.settings.applications.instantapps.InstantAppButtonsController;
  import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate;
+ import com.android.settings.enterprise.DevicePolicyManagerWrapper;
  import com.android.settings.fuelgauge.BatteryUtils;
  import com.android.settings.testutils.FakeFeatureFactory;
 +import com.android.settings.testutils.SettingsRobolectricTestRunner;
 +import com.android.settings.widget.ActionButtonPreferenceTest;
  import com.android.settingslib.Utils;
  import com.android.settingslib.applications.AppUtils;
  import com.android.settingslib.applications.ApplicationsState.AppEntry;