Merge changes I5187d17c,I49a76582

* changes:
  ConnectivityService: regroup bool <-> int conversions
  ConnectivityService: move reportNetworkConnectivity to handler

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