[automerger skipped] Merge "Add new end-block-suppression command" am: ee06622cd6 am: 6f116b8f3f -s ours

am skip reason: Change-Id I37f1f0c326b5ebce715903f7e70c669f5c247d4e with SHA-1 489d928688 is in history

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

Change-Id: I5eb71019ded82b1547fc07c93be6e52615397f23