am 4843993e: Merge "Fix Connectivity Manager test:"

# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '4843993e6fbe6429221cd0e9ed72861f5cff46cf':
  Fix Connectivity Manager test: