CHERRY-PICK: Swanky: Add bluetooth device ID

BUG=chrome-os-partner:30451
TEST=Verified SDP output for DI contains 00E0:241E:0400

Original-Change-Id: Ifae5d836f78843612fa65ffa5551adca40eabc11
Signed-off-by: Anson Tseng <anson.tseng@intel.com>

Conflicts:
	overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r4.ebuild
	overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r8.ebuild
	overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r9.ebuild

Change-Id: If5c904be146bb2f563a79f867c0cf478af4cb60b
Reviewed-on: https://chromium-review.googlesource.com/208615
Reviewed-by: Scott James Remnant <keybuk@chromium.org>
Commit-Queue: Anson Tseng <anson.tseng@intel.com>
Tested-by: Anson Tseng <anson.tseng@intel.com>
diff --git a/overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r4.ebuild b/overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r5.ebuild
similarity index 100%
rename from overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r4.ebuild
rename to overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1-r5.ebuild
diff --git a/overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1.ebuild b/overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1.ebuild
index ea66148..27cd7d8 100644
--- a/overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1.ebuild
+++ b/overlay-swanky/chromeos-base/chromeos-bsp-swanky/chromeos-bsp-swanky-0.0.1.ebuild
@@ -44,4 +44,8 @@
 	doins "${FILESDIR}/discharging.png"
 	doins "${FILESDIR}/connect_ac.png"
 	doins "${FILESDIR}/connect_ac_batterycutoff.png"
+
+	# Install Bluetooth ID override.
+	insinto "/etc/bluetooth"
+	doins "${FILESDIR}/main.conf"
 }
diff --git a/overlay-swanky/chromeos-base/chromeos-bsp-swanky/files/main.conf b/overlay-swanky/chromeos-base/chromeos-bsp-swanky/files/main.conf
new file mode 100644
index 0000000..84cd26c
--- /dev/null
+++ b/overlay-swanky/chromeos-base/chromeos-bsp-swanky/files/main.conf
@@ -0,0 +1,2 @@
+[General]
+DeviceID = bluetooth:00E0:241E:0400