Use assertEquals instead of assertTrue

assertEquals provides more meaningful error logs when the test fails,
which was helpful in order to investigate the associated bug.  This change
does not correct all places where assertEquals would be useful, but only
those needed for this bug (and one other bug that was also failing).

Bug: 8181114
Change-Id: I62e807749c29721287aecf61e60dd80fd7e62f20