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

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

Change-Id: I927174e5a05c70d50d1959a135773cf9df096cc5