Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Stop requiring CHANGE_NETWORK_STATE to change Ethernet config.

Change-Id: I27e05c3978bb5b82331c81fd1e60a10616a1bd02