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

Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80