[automerger skipped] Merge "DO NOT MERGE New back affordance small polish nits" into tm-qpr-dev am: 2f49f787c8 am: b6857ad650 -s ours am: 1ce0d2cf5b -s ours am: 24b1ec5612 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21483766 Change-Id: I27d3236629517d0920f27c3d808e2373076389e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: