[automerger skipped] Merge "Modify PhoneCapabilities for device capabilities" am: c06dc8bace am: e77ddcd34c am: 833f141b21 -s ours
am skip reason: Change-Id I9f5312606b1dc5fc8bd25569f194475be2e20a95 with SHA-1 0605abf494 is in history

Change-Id: I32f8694251761513e4c3f223a64c2eaf2b9028fe