[automerger skipped] Opp:  Bt device picker launch issue skipped: bc86709f5f

Change-Id: I8b82f082e4418e01de35aaedd875b5811f103b51