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

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

Change-Id: Ie99e5ade62b246ba8e9581395117fac20ca550d0