Merge "Add carrier config for the SIP 486 request forbidden and add API for...

Merge "Add carrier config for the SIP 486 request forbidden and add API for SHELL command to remove the UCE requests cannot be sent the network status." am: 011be0d1 am: b776230e am: 50c3a90c am: 6bf12e12 am: 1d15edf2 am: e0992ddf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689574

Change-Id: I271ea298c2c16ee99592b9307408fec8ff9e8ac2