Merge changes from topics "revert-10153355-dev_cap-JUKVIAUYRW", "revert-9919494-device_cap-HJIMIMXSXL"

* changes:
  Revert "Modify PhoneCapabilities for device capabilities"
  Revert "PhoneCapability cleanup"