[automerger skipped] Merge "Revert "Modify PhoneCapabilities for device capabilities"" am: a20e1b9872 am: e32f280532 -s ours am: ae3f511cba -s ours am: 945004c800 -s ours
am skip reason: Change-Id Ie89a592f2c15b74cdbef211114dfca8a5b7df29a with SHA-1 7caee495eb is in history

Change-Id: If1b8027857a34f5b8dae9e739bd16a5886d40d92