Merge "Remove unused phonys" am: fa60f334c3

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

Change-Id: I3f2967b29612dc4dca5190b4e3490594e8950e05