Merge "Enable new back affordance in teamfood" into tm-qpr-dev am: bf7ec45b

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



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