Merge "Remove double check interface by NetworkInterface" am: 79ce290397 am: e788bd3bf0 am: ab364519ad am: 676fa106c9 am: 1d222edd71

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

Change-Id: Ic411fd07e82029fb3bb557912481af1170d310d0