[automerger skipped] Merge changes from topics "caps_refactor", "multi-plmn", "nr_band", "v6mtu" am: d8c60800ae am: 6e3048d2f7 am: 6726fc9db8 -s ours
am skip reason: Change-Id Id86ad81d837c983e2d34633fdebdfc308e219a3d with SHA-1 1dfeba3c47 is in history

Change-Id: I5baa98ef8126d8b4f5be7f28c9ff197e9c912740