Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 am: 204f35dc58

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib9676c28c112cc712f91f9e8c40b1e1e9aa61fa4