Merge "Remove unused phonys" am: fa60f334c3 am: 402f771fc8

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

Change-Id: I6419ed3804c2129b08ae602bef073bd7987e53e6