[automerger skipped] Merge "Introduce aconfig flag to fix VCN crash on...

[automerger skipped] Merge "Introduce aconfig flag to fix VCN crash on receiving configs" into main am: ddaf2510 am: bc441bb1 -s ours

am skip reason: Merged-In If3309b12f43a783b0904c2fef0267639d3ec1a85 with SHA-1 92380d72 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3008474



Change-Id: Ia85d40bee9cddf10c8081d0ed44040218624a587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>