Merge changes from topics "multi-plmn", "nr_band" am: 7b2d5183dd am: 5c96a4a2d6

Change-Id: I1f56da2c4cc38a9cacf1af71927903a6c66c5f73