Merge "Merge "Switch preffered display mode on lock screen" into qt-r1-dev am: 311e1db11d am: c8359c5527" into qt-qpr1-dev-plus-aosp
am: 76a3e8f3df

Change-Id: Ib42c366c387c8c4f43d17fe5b675df94d212cd61