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

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

Change-Id: I1f7866738e8c717bb48791e5904080be0bb0318e