Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924

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

Change-Id: If8c106b8d0f2f71e47942a151de49daf1b65b852