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

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

Change-Id: Icaa939614857ff4adba9181b45480adb44b74fcf