[automerger skipped] Merge "Modify PhoneCapabilities for device capabilities"...
[automerger skipped] Merge "Modify PhoneCapabilities for device capabilities" am: a94ba362 am: fbb0de77 am: 6fadc381 -s ours
am skip reason: Change-Id Ic00bb3ba81d5460a04f08312fc9b90bf61cd4c6b with SHA-1 78e2517c is in history
Change-Id: I04f1c0d4c0d8b6de1b5927c9014754a7112dc6eb