[automerger skipped] Merge "Fix .equals call in ImageDecoder" into rvc-dev am: 33696c1cca am: 28b7db1e6b -s ours
am skip reason: Change-Id I0df5d2407a32fad0e21e597697af293fbc2fb315 with SHA-1 6419ebff5c is in history
Change-Id: I22cfa964eafc4e303530ba9d628349de0356588a
This commit is contained in: