Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" into rvc-dev am: 8d58b990 am: c0423a93

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/11509631

Change-Id: I4dfbc340ab929291f334d22612d750900a5106c3