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 am: cc6d191e

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



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