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

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

Change-Id: I116aafba8849e6c5f5f6274159a1bcf722376a5e