Merge "Enables custom quick affordances in team food." into tm-qpr-dev am: f4f0f07c

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



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