[automerger skipped] Revert "PhoneCapabilities changes for device capabilities" am: 6ba3da0d23 am: 1b6ac8442f -s ours am: 98dea11362 -s ours am: 159b19f8d1 -s ours
am skip reason: Change-Id I9b268f41614149b5cd55caf3d730b25bb1f885e9 with SHA-1 80a755fa0b is in history

Change-Id: Ib9367caea4bae61c06eacd8fb83bbfdffacb23d9