Merge "Add the capability to list bluetooth HFP as emergency capable phone...
Merge "Add the capability to list bluetooth HFP as emergency capable phone account" am: 06aef134 am: 530258d8
am: d62f63a8
Change-Id: If97c0ece50e49d33af75e8b4f023114120449744