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

Change-Id: I8c707c615ce3e74cd51db321581c0e7e123c0d95