Cherry picking BitmapUtilTest fix.

Fixed on master in I85268c040498621a324c459ce237a51b30e7d3a4.

Bug: 7633565
Change-Id: I47fe32cdcc3780d42be99283f7b6e42b4e4ab940
1 file changed