Merge "Enables new remove app and connected add-edit controls in team food"...

Merge "Enables new remove app and connected add-edit controls in team food" into udc-dev am: 2002de36

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



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