[automerger skipped] Support for audio coupled haptics when playing ringtones. am: 8c47a677
am: 0587707b -s ours
am skip reason: change_id Ie5fc285a0181b27672fd4f8ffae9610b1b1f3b02 with SHA1 9c4ebe80 is in history
Change-Id: I3599ea1a98a6180e75001a2411959a4ec6aa78fc