Revert "Add a new api that does not send PUBLISH request with duplicated presence capabilities"

This reverts commit 08151870.

Reason for revert: CL caused NPE in certain scenarios - b/220236505

Change-Id: I7d6843f6cbabd499a99f530409e247228e9a8f27