resolve merge conflicts of 132a5027 to rvc-qpr-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5

core/java/android/bluetooth/BluetoothHeadset.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public final class BluetoothHeadset implements BluetoothProfile {

		/**
		* Intent used to broadcast the change in the Audio Connection state of the
		* HDP profile.
		* HFP profile.
		*
		* <p>This intent will have 3 extras:
		* <ul>