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

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

Change-Id: I137e5b50aba1d1492730c80ca5134aa6d9da5e0b