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

Change-Id: I5486e9edc00a98278f6faa04a06ccee82945e7cf