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

Change-Id: I1335bd63a1cad1bc889d37e7b6fad295d259ce78