[automerger skipped] Merge "Fix VCN crash when retrieving carrier config while...

[automerger skipped] Merge "Fix VCN crash when retrieving carrier config while phone is gone" into main am: 6bef7bab am: 33123754 -s ours

am skip reason: Merged-In I784610b243db2a666c1fe89b1438950a2f6a1478 with SHA-1 d7ebd7c1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3008497



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