[automerger] Fix clipping of adaptive icons Bug:62372639 am: 49df554dc2

Change-Id: If59cb96023914f65fca3d75eb6f3155deeb1932c