[automerger skipped] PhoneCapabilities changes for device capabilities am: e1d1b0b92c am: 3b5db56bd4 am: 71f7f2fbd3 -s ours
am skip reason: Change-Id I424ef176086d2308a4bf53b2c79407eabafb3178 with SHA-1 322c4cc286 is in history

Change-Id: Ie05c67d856e1eaed68aa3ba84accc9cf690ce268