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

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



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