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: 8334f7fd am: 7fa65fe5
am: 7025e95d
Change-Id: If97c0ece50e49d33af75e8b4f023114120449744