am e7f887da: resolved conflicts for merge of 55936599 to stage-korg-master

* commit 'e7f887dab2591a46ecf80616e00f33bb5d847935':
  code cleanup. unused imports, local variabls and static constans removed from com.android.bluetooth.opp package.