Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c...

am: d3b8a5c332

Change-Id: I881c1ab09187ab23facc03bb71cc38a7978e442c

diff --cc Android.bp
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
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