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

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

Change-Id: Ib80c34d58b705a05e837091ceaaa05858f2508ec