Merge "Add new headers flags to teamfood" into tm-qpr-dev am: e373c68b

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



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