[automerger skipped] Merge "wifi.proto: Add metric for installed passpoint profile type" into pi-dev am: 8f938095b4
am: 003a46d4ad  -s ours

Change-Id: I105102192087fb0f8af3d30461bf9d1a1a4443dc