Merge "Ensure we use android:dropDownListViewStyle" into mnc-ub-dev