Merge \\"Enhance logic for determining if answering call will disconnect fg...
Merge \\"Enhance logic for determining if answering call will disconnect fg call.\\" into nyc-mr1-dev am: c73180f2
am: b342069b
Change-Id: I9833bdf02cad09af2a520de1b8189106101af604