Merge "Remove AA+ decorator logic from aosp code" into sc-dev am: 8a5e0c8e27

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

Change-Id: I2edb6c516bf646bcc93b5d451cdd86f88ecb5d27