Merge "Fix ANR issue in CallsManager"
am: 258ed877a1

Change-Id: Ie4265e95bed8ab027fb57f8785c069c3a49de5aa