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

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



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