Revert "Remove unused phonys" am: 4a6890934a am: de7d9d4824 am: de4250aa50

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12346391

Change-Id: I55a0c506d7a2ebabc913aaf05b0ab573078265d9