[automerger skipped] DO NOT MERGE Fix the icon overlay after density change
am: 0857955332  -s ours

Change-Id: I5a0dddfb0dc34784dee3ba27d066e8bde2de419e