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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95378d6ba07d78cb379c92dbd3c50e7b884c2d25