Fix Bluetooth pairing dialogue crash am: e51972868c
am: 244ebc1e31  -s ours

Change-Id: I275eea31757afd6801cce5096a380b203fb4b763