[automerger skipped] Merge "Change Ringer#startRinging to work...
[automerger skipped] Merge "Change Ringer#startRinging to work asynchronously." am: 072e4198 am: 024322a7 -s ours am: 20b353b6 -s ours
am skip reason: Change-Id Ic14c43e7be1b487134047ebe27bddb6e796f3481 with SHA-1 529ec5d5 is in history
Change-Id: I585cc7b0696f7480c76fe6420078982e4a45e1c4