Merge "Dismiss keyguard when opening settings" am: 3d2a4f2300 am: 78511ea7a9 am: 1e0a6ef269

Change-Id: Icc344e27be5781831645dfc61c7a6cefaaf8f878