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

Change-Id: I1cdba5a4bcca50a7c9e9983e95dd8ccb898f125e