Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d1 am: aadbb2d4" into nyc-mr2-dev-plus-aosp