Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b
am: 8951172562

Change-Id: I3799156a83400d9fa1aa07a4afd935bd9c0f683b