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

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

Change-Id: I384c827bd33da2d33ba23a9519e530210e13ace1