Bug 1020166 - Update test_mmi.py/test_settings_device_info to handle new test data structure/dual imei
Merge pull request #21682 from zacc/bug_1020166_v2.0

Bug 1020166 - Update test_mmi.py/test_settings_device_info to handle new...
Merge pull request #21571 from ian-liu/bluetooth/bug1029037_pairing_dialog_is_closing_abnormally_while_screen_is_transitioning

Bug 1029037 - [B2G][Bluetooth]Screen transitioning while reciving a pairrequest will not close the pairing dialog normally. r=@arthur
(cherry picked from commit a35527a3e3cd44e2586adbd207da5a36b9407aa6)