Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am:...
Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9 am: 717d9f20 am: 0493302a
am: 28dc5762
Change-Id: I7a5904dfc21b9791302d8d5f3f3616061a8577f7