Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec
am: 717d9f205a
am: 0493302a06
Change-Id: Ib82a2ed83b783816ad2305d51f3ec823c6d83926
This commit is contained in: