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