Merge "Remove unused phonys" am: fa60f334c3 am: 402f771fc8 am: 86c9aeda24 am: 4eee4e3857 am: e3597398a9

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

Change-Id: I9b01fad2772f5366030b0dbbf098c0131f3e26cd