Merge "Defensively check for batterystats service instead of blocking to get it."

    const sp<IServiceManager> sm(defaultServiceManager());

    if (sm != NULL) {

        const String16 name("batterystats");

        // use checkService() to avoid blocking if service is not up yet

        sp<IBatteryStats> batteryStats =

                interface_cast<IBatteryStats>(sm->getService(name));

                interface_cast<IBatteryStats>(sm->checkService(name));

        if (batteryStats != NULL) {

            batteryStats->noteResetVideo();

            batteryStats->noteResetAudio();