Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb9484d am: badc5c5ef4

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

Change-Id: I13d9a513a437151a6a369fa124811ae9ba721f75