Merge "Do not allow apps to cause Bluetooth to be discoverable forever"
am: 692ad7c9ec

Change-Id: I60f576fee6222d0917ce845dd0bc071817d26009