Merge "android.net: Introduce @hidden parcelable InterfaceConfiguration class"