Merge changes from topic 'am-94906183e52945938953177851714b42' into oc-mr1-dev-plus-aosp

* changes:
  Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a1 am: 9295f58d am: 502986f7 am: 52231062 am: 995d0202
  DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b9156  -s ours am: ff557999  -s ours am: 17e2448c  -s ours am: 0dbabf02  -s ours am: 636750bd  -s ours