Merge "Merge "Avoid using secondary displays as launch params when not...

Merge "Merge "Avoid using secondary displays as launch params when not support" into qt-dev am: c5568f9a am: 54ce005a" into qt-r1-dev-plus-aosp
am: 069ecf3b

Change-Id: I224be874e81dff43a03432c40c7d533469612b67