Merge "Worked around the random CTS testOtherH264ImageReader & DecodeAccuracyTest failure. am: dfc4b4b2ca am: c931ff2293" into oc-dr1-dev-plus-aosp
am: 74cdc413ac

Change-Id: I894bf55c87685fcdd1d0f8efebe2aad81c4b3599