Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e
am: 2d0ad3a9e7

Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01