Merge \\"Fix issue #30013670: Phone AP crash when testing VT call\\" into nyc-mr1-dev am: ab1b52a0c4
am: aa055e7f2d

Change-Id: I8b27b4e09bb563fe8088f49415eb2e06720ac522