[automerger skipped] Merge "Fix .equals call in ImageDecoder" into rvc-dev am:...
[automerger skipped] Merge "Fix .equals call in ImageDecoder" into rvc-dev am: 33696c1c am: cd6d5575 am: d6cb07f0 am: 4b021960 -s ours
am skip reason: Change-Id I0df5d2407a32fad0e21e597697af293fbc2fb315 with SHA-1 32b31b56 is in history
Change-Id: Ic9dddaf94b92ddc84dbaa21717ace1138f16d435