Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon" am: 6493f3df6b am: 7a3fd84b1e
am: 8ff8b498ca

Change-Id: Ia0c5c1876c2220b02f1e795700b07cf1088b531c