Merge "Add the capability to list bluetooth HFP as emergency capable phone account" am: 06aef13469
am: 530258d8d6

Change-Id: I33e9569f03a801209b1686b50980277c6c41a8bd