[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: 28b7db1e -s ours am: 129e2f88 -s ours
am skip reason: Change-Id I0df5d2407a32fad0e21e597697af293fbc2fb315 with SHA-1 6419ebff is in history
Change-Id: I5e79f5bc39634c8d62212e3ee549fdfd115d9338