Merge "Allow disabling of Bluetooth tethering if DISALLOW_CONFIG_TETHERING in on"
am: d5bb9ffd9d

Change-Id: I9d15e3c0246bc638535a8ef0e933032102e79b97