Merge "Fix issue of hearing ring sound twice." am: 97e43b238c am: 4cce509175
am: ebfabc2348

Change-Id: Ib72b9fe05dd7cdd421d659497afeb82f322c7e6b