Revert "HTML injection fix for bluetooth pairing, issue 65946"

This reverts commit 342657968de0b7a2d9bc7cc40cc09c6daa1c9eeb.
Bluetooth: Set alias name only through Rename option

Set the alias name only when user is trying to change the
name using the Rename option of paired device.

CRs-Fixed: 539420
Change-Id: I415b6a962d8e7884b67d37b94c04df19e2c23012
Bluetooth: Don't set a null alias before unpairing

* This causes the unpair action to throw a null pointer exception and
  bring down the Settings app. Don't do this.

Change-Id: I0c60437f5ea934385a037a464743e24c9d341aca
Merge branch 'kitkat' of github.com:X-ROM/android_packages_apps_Settings into kitkat