Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" am: ddb2a7c31b

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

Change-Id: I23d3175521bddf52c233f21354843bf74e4f8cb8