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

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

Change-Id: I9764d7070c44f8b8db654e9f6520d4f5c6d00cb3