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

Change-Id: I1145b5351cadc986d98989580de332b5a6a3d33a