Merge "Modify PhoneCapabilities for device capabilities"
am: c06dc8bace

Change-Id: I9a6c7d7c9b99c20d7b61dba2b67c10959cc582a7