Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev am: 96da027196
am: 4f4d64659a  -s ours

Change-Id: Ifc982b4ab344d377494a761fab05cd418261fc33