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

Change-Id: If97c0ece50e49d33af75e8b4f023114120449744