[automerger skipped] Merge "Add new API to PhoneInterfaceManager" am: c64e5c39b5 am: f54dbcc54d
am: 13196845ca  -s ours

Change-Id: I0095b32b19fc18b09318387405aa08afa0a03643