Fix device selection when android_payments flag is on (bug 938716)