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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic485fba28eaa361219a4c552a46e5d08b491a836