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

Change-Id: I135ea15d2bcf1c3f3c1f0afe45418fbc0433c8d2