[automerger skipped] [DO NOT MERGE] Fix clipping issue on adaptive icons skipped: 34973c93e4

Change-Id: I70f0778ed7028f37f59699ed0a80b4d33ae80a4c