[automerger skipped] Merge "PhoneCapability cleanup" am: b922a13760 am: b2cf59c78c am: 3ea02b9c0a -s ours
am skip reason: Change-Id I2510de0ab1ce40c8d191a17dbae7f4c33418006c with SHA-1 75e6aa2764 is in history

Change-Id: Ib4c8895efc2411d7f744d24ae2ec46667cf85eea