Merge "Merge "Displays that have focused apps can also be top focused" into...
Merge "Merge "Displays that have focused apps can also be top focused" into qt-dev am: fbfb36f5" into qt-dev-plus-aosp
am: 29832bc0
Change-Id: Idab5fd0f1c8ca3defd49d5c0a20b163e731904ac