Merge "Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev am: fe44acf0 am: c012157f am: 1e49b193" into tm-qpr-dev-plus-aosp am: 9bd5e0ee

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



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