[automerger skipped] Merge "Update rule for BasicShellCommandHandler" am:...

[automerger skipped] Merge "Update rule for BasicShellCommandHandler" am: 64e6a1ee am: 6332f9e0 am: 90e17d64 am: baa5eb86 -s ours

am skip reason: Change-Id I297ac73dadcbfcccadcc1618a90989bedc823779 with SHA-1 387e11c3 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1483742

Change-Id: Id62b6c316418238118bd86bb9803e3052caa5468