Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" into rvc-dev am: 8d58b99085 am: 417467ca11 am: d8da7f03f7 am: c50a773104

Change-Id: If0c7b58bd00ad5ca475038a87438f3c59ac63478