Merge "Keep BT pairing dialog valid until timeout"
am: e285ab9ebf

Change-Id: I672bf4670305eb85df2336a2da015d9d0646fd8b