Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()."