[automerger skipped] Revert "PhoneCapability cleanup" am: a0349b9640 am: e8d6ac6ba3 -s ours am: 765e222d9a -s ours am: 237e095f6f -s ours
am skip reason: Change-Id Ia6a528b5677eb561a0845fca3d8141385d8bc2da with SHA-1 3fd9bc7e2c is in history
Change-Id: I0e1b69d64429969589ca24cb900d14dab4b632b6
This commit is contained in: