Merge "On reset, show keyguard if not already shown" into rvc-dev am: c8cd1ad5 am: 46c63247

            }

            mKeyguardUpdateMonitor.sendKeyguardReset();

            notifyKeyguardUpdateMonitor();

        } else {

            // This is necessary in order to address an inconsistency between the keyguard service

            // and the keyguard views.

            // TODO: Investigate the source of the inconsistency.

            show(/* options= */ null);

        }

    }