Merge "Bug: 147027346 Test: run cts -m CtsGraphicsTestCases -t android.graphics.drawable.cts.AdaptiveIconMaskTest#testDeviceConfig_iconMask_useRoundIcon" am: e63a2cdba7 am: ddc89c5a29 am: dd94c5fd7e

Change-Id: I5e443d0bfeb037e2120180941b3375f4e8c1d35c