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

Change-Id: I3446544111ec1d4c9945121acd66c9da5a8695d6