Merge "On reset, show keyguard if not already shown" into rvc-dev am: c8cd1ad532 am: 39d5dfa9ef
Change-Id: I3398f8f455772a49f83955a26e87cd1c8bfe8635
This commit is contained in:
c8cd1ad532 am: 39d5dfa9ef
Change-Id: I3398f8f455772a49f83955a26e87cd1c8bfe8635