Merge "Use cached keyguard flags during relaunch." into oc-dev
am: 9eb635c428

Change-Id: I33a077d03618fdebebdd36af2e0db103fbd7ce3d