Merge "AA+ Final UX spec changes" into sc-dev am: bdb06a7d42 am: 79571f2c73

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

Change-Id: If0559b2b6d137b5a310990e037dc24fd431ca55a