Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" into rvc-dev am: 8d58b99085 am: 4a345bbfa9 am: cde3d6a37d am: 6d865f2d39

Change-Id: I50976873a8453c33c352107eaa8275f6c99d5886