Merge "Make new headers flag true by default" into tm-qpr-dev am: 300564f9 am: eecff467

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



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