[automerger skipped] Merge "DO NOT MERGE New back affordance small polish...

[automerger skipped] Merge "DO NOT MERGE New back affordance small polish nits" into tm-qpr-dev am: 2f49f787 am: b6857ad6 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21483766



Change-Id: Ie074e3028562fa3b735474272cb3eb23ee3be2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>