Apply contact save ops before we reach the max batch op threshold

In order to test the special case handled by this CL, you may want
to use a contact consisting of at least 23 contacts.

Bug: 22986058
Change-Id: Ic141a7b52907be930d898d1710e95aa5ffe9be8a