Merge "Remove ability for Released or Resource flags to be "teamfood"." into udc-dev am: 48f69382 am: 0ccedb52

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



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