Merge cherrypicks of [15800897, 15800899, 15800901, 15800903, 15800905,...

        const bool isVendorService =

            strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;

        const long timeout = uptimeMillis() + 5000;

        const long timeout = 5000;

        int64_t startTime = uptimeMillis();

        if (!gSystemBootCompleted && !isVendorService) {

            // Vendor code can't access system properties

            char bootCompleted[PROPERTY_VALUE_MAX];

        const long sleepTime = gSystemBootCompleted ? 1000 : 100;

        int n = 0;

        while (uptimeMillis() < timeout) {

        while (uptimeMillis() - startTime < timeout) {

            n++;

            ALOGI("Waiting for service '%s' on '%s'...", String8(name).string(),

                ProcessState::self()->getDriverName().c_str());