Merge "Merge "Fix DecodeAccuracyTest random failures." into oreo-cts-dev am: 4109a2451c"