Merge "[Media TTT] Adding Haptics" into tm-qpr-dev am: 922e19de am: 55a59bb3

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



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