Merge tag 'android-16.0.0_r4' of https://android.googlesource.com/platform/packages/modules/Connectivity into HEAD

Android 16.0.0 release 4

Change-Id: Ie5d8761e393a1d16ba3e10afdaf2b3906c3d5d68