Merge "Clarify documentation for getActiveNetworkInfo and friends"
am: 39d6694208

Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427