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

am skip reason: Change-Id I37f1f0c326b5ebce715903f7e70c669f5c247d4e with SHA-1 9e94558846 is in history

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

Change-Id: Iffc89ea0e6b08d7f7b54e26736aa1217ab4e79f3