Merge "Inject DeviceIdle atom before boot completes" into rvc-dev am: e9e4428d4d am: 3939c13ce4 am: d1d83106a7

Change-Id: Ifb4719ed904d55c5af88c9854ac0e93b0864c2e4

cmds/statsd/src/StatsService.cpp

@@ -1288,7 +1288,6 @@ Status StatsService::getRegisteredExperimentIds(std::vector<int64_t>* experiment
     return Status::ok();
 }
 
-
 void StatsService::statsCompanionServiceDied(void* cookie) {
     auto thiz = static_cast<StatsService*>(cookie);
     thiz->statsCompanionServiceDiedImpl();

core/java/com/android/internal/os/BatteryStatsImpl.java

@@ -9875,6 +9875,10 @@ public class BatteryStatsImpl extends BatteryStats {
         mPlatformIdleStateCallback = cb;
         mRailEnergyDataCallback = railStatsCb;
         mUserInfoProvider = userInfoProvider;
+
+        // Notify statsd that the system is initially not in doze.
+        mDeviceIdleMode = DEVICE_IDLE_MODE_OFF;
+        FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mDeviceIdleMode);
     }
 
     @UnsupportedAppUsage