Merge "DO NOT MERGE Remove explicit indicator flag from teamfood." into tm-qpr-dev am: 2438409e

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



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