Merge "Fix AA+ decorator drawing out of bounds issue / Make AA+ opaque" into sc-dev am: 1b56eb4e6f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13848240

Change-Id: If8fc14a848a53deafb01bdc368295faa75bd7622