Merge "Submitted on behalf of 3rd party copied from packages/apps/Bluetooth/" into klp-wireless-dev