[automerger skipped] Merge "Version adaptive icon to v26" am: d0afb22efb
am: db4fe88194 -s ours
am skip reason: change_id I4f5a942c1e52f64ee3d99aa32faae8c485695fc9 with SHA1 f42912ccde is in history

Change-Id: I68553a08e2e568cd2fa887121a2ae39d3976a1a8