Re-apply "Remove unused phonys" am: ec48185671 am: 59e850c2ff am: 10e3b376f5

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

Change-Id: Ib73b9c9a4753cb5dca6a7f85fc86c6882175e8be