Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am: f04714c59a
am: 6281d64277

Change-Id: Ic7b12c406ac5aea0e9f40b5f2c2f72c5efd87212