Count both inititing and accepting friends (Bug 1348428)

When counting 'make friends' towards progress bar

Change-Id: I50574ac5339b07d89e194f915f6feeded91e28fd
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Merge "Count both inititing and accepting friends (Bug 1348428)" into 1.9_STABLE