Fix three harmony tests that failed on Android and the RI.

(cherry-pick of 55b505d649b4babcc8420673050cac50c9c41c9c.)

Bug: 7288264
Bug: 7307154
Change-Id: I4cde772e8860b98cb01230c7628446a58cebc8c4
1 file changed