Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
am: 44ef19d131

Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69