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

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

Change-Id: I2690229c452584dd6941dcc2a1356f800470b715