Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev...

Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev am: fe44acf0 am: c012157f

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



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