Merge "Implement issue #73301635: Ability to extract device configuration"

diff --cc services/core/java/com/android/server/am/ActivityManagerShellCommand.java
index 07e27bc,f439fae..3b2a22d
--- 1/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
--- 2/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
@@@ -23,9 -23,9 +23,10 @@@ import android.app.IActivityController
  import android.app.IActivityManager;
  import android.app.IStopUserCallback;
  import android.app.IUidObserver;
+ import android.app.KeyguardManager;
  import android.app.ProfilerInfo;
  import android.app.WaitResult;
 +import android.app.usage.AppStandbyInfo;
  import android.app.usage.ConfigurationStats;
  import android.app.usage.IUsageStatsManager;
  import android.app.usage.UsageStatsManager;