Merge "Allow wifi and ethenet connected at same time."

diff --cc core/java/android/provider/Settings.java
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge

diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge