Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" into rvc-dev am: 8d58b99085 am: 4a345bbfa9 am: 00ffb9582b

Change-Id: Ic1cf45e862096d8fa45591391ea7055ddf8d20d8