Merge "Fix teamfood definition for five flags." into tm-qpr-dev am: dd09bcde am: 75a6e991

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



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