[automerger skipped] Fix failing test testPromiseIcon_addedFromEligibleSession. am: d6ae55d968
am: f1ce0f31ab -s ours
am skip reason: SHA1 f1ce0f31ab skipped by user jonmiranda

Change-Id: I5bfc823c2e73b0278bf1cee0292f12581e85df36