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

Change-Id: I686a984b32b8a8bfe6d221e5cf543b2137199a1b