Merge "Make Bluetooth constants used by gmscore a system api" am: ff9bc3a88c
am: 6dc20d40fd

Change-Id: Ic7d15fe855d7e3e6b3c9444e0641e2e141181154