[automerger skipped] Merge "Remove call only after the incall service is...
[automerger skipped] Merge "Remove call only after the incall service is bound" am: b9f32ef8 am: 3d19f841
am: 8e7c5c56 -s ours
am skip reason: change_id Ia37df275f2972ef15b57df29233cd4538aa8191f with SHA1 22dd060b is in history
Change-Id: Ie1c8d0d3c536451d5f7023f354aad5f61aae6f47