[automerger skipped] Merge "Add the haptics team to Ringtone OWNERS." am:...

[automerger skipped] Merge "Add the haptics team to Ringtone OWNERS." am: 715355b6 am: e733592e am: 67d10dd8 am: 8bc4ca99 am: cf579820 am: b153a23e -s ours

am skip reason: Merged-In I9f1e8c394d53fe2aa00242a1d63f7df8234004ba with SHA-1 1064d6ea is already in history

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



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