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

Change-Id: I0301f0ad7cadda7c45a39f76fa4693f16f38b298