Merge "[eSIM BootStrap Support] Add new field to ApnSetting" into main