Re-apply "Remove unused phonys" am: ec48185671

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

Change-Id: Ia98fba047fcc30e0d0c5790a2fcf00568206b509