[automerger skipped] Merge "Enable new back affordance in teamfood" into...

[automerger skipped] Merge "Enable new back affordance in teamfood" into tm-qpr-dev am: bf7ec45b am: 99fcaecf -s ours

am skip reason: Merged-In Ib5594ad4f6945d4bcf1a8c54fb781e68ee1943e3 with SHA-1 d5f75bbf is already in history

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



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