Merge "Create carrier config for NR enabled setting" into rvc-dev am: a718624635

Change-Id: Icac96dfc861d197caa0f6e7c47807e9c5dd4d8fd