Merge "Fix that Keyguard didn't always get onActivityDrawn call" into lmp-dev

            ActivityOptions.abort(options);

            if (DEBUG_STATES) Slog.d(TAG, "resumeTopActivityLocked: Top activity resumed " + next);

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();

            // Make sure to notify Keyguard as well if it is waiting for an activity to be drawn.

            mStackSupervisor.notifyActivityDrawnForKeyguard();

            return false;

        }