Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 8cd8519eab
am: c7e3832e80
Change-Id: I8cb5200d38539d56c3f73fb7cd6ffaeb57dccf56
This commit is contained in: