Merge "Remove double check interface by NetworkInterface" am: 79ce290397

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032

Change-Id: Id8904075001709f2c62a55293f835c5a73ad9d79