[automerger skipped] DO NOT MERGE New back affordance small polish nits am:...

[automerger skipped] DO NOT MERGE New back affordance small polish nits am: 92e8dafe am: cb0fa357 -s ours am: 4f1eea09 -s ours

am skip reason: subject contains skip directive

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



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