Revert "PhoneCapabilities changes for device capabilities" am: 6ba3da0d23

Change-Id: Ia32e50c14e9f138ed5a9ab3942445e691c16c3cf