Merge "switch to netd_aidl_interface-unstable-java" am: b372267cf3 am: 1c41287136

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1324407

Change-Id: Ic8f66e5f45ccf5ed6a071291e610b418ab7efb88