Merge "Add carrier configs for NR SA unmetered" am: df6e608fca

Change-Id: I086aef3228ff3c3a051889e5fe9bcc5a49351faa