Merge "Add carrier config item for P2P SMS and ESOS inactivity timeout value for satellite" into main