Revert "PhoneCapability cleanup"

This reverts commit d2283c4067a2458070821cb6dee10ec5b773424f.

Reason for revert: Change not supported by vendor

Change-Id: Ie435e8f049a621bf02c79c8154eef395c96c9ed3
Merged-In: Ia6a528b5677eb561a0845fca3d8141385d8bc2da
1 file changed