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

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

Change-Id: Idf1d18261c954e22989774ae97a12261551b31f6