Merge "Add EXTRA_ANSWERING_DROPS_FG_CALL to incoming call in some DSDS cases." into sc-dev