Merge "Modify PhoneCapabilities for device capabilities" am: c06dc8bace am: e77ddcd34c

Change-Id: Ib6b4137140ce05d925f4e3a04497b6127902ff65