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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bcc4d8bb60001ffda787b68c12f03ee5c87d95f