Merge pull request #23563 from crh0716/revert_embed_bt

Bug 1061437 - Revert the patches of embedding BT app in settings app r=eragonj, iliu