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
am: 2133b983

Change-Id: Ic2068ff7dd63564eaec6193ffca0a605968230aa