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: Ic4a70896b9d90963b86b535271cec14e0c9363d9