Merge "Make bluetooth choppy voice notification cancellable" am: 6d5ab0d07f

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1594984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdee3f8b6a33052b8e02b27f615bf2c4a56bbaf5