[automerger skipped] Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" am: ddb2a7c3 am: 1d547af1 -s ours am: 9b67498f -s ours am: a3c962a7 -s ours

am skip reason: Change-Id Ifcb6045ae5e198dea8f9b5d6741fb8d3a9dab9d3 with SHA-1 20aab9cd is in history

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

Change-Id: Iaccda466e647421c91831e4b8be4b815a2152b67