Merge "Revert "Modify PhoneCapabilities for device capabilities"" am: a20e1b9872

Change-Id: I2ea4aa7827e945c0bf8087719fa6825e0d902a30