Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev am: 855210170c am: 1377955965
am: 2154beb07e

Change-Id: I9c0fa23c50528802ad22a2a9de0af0b4660b43db