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

Change-Id: I44561cff9d3f66373c35d8e1c675229ca38eb1fa