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