Merge "Add 5G RAT into Bearer field." am: 5f6a4b1dae am: 3350d4d05d

Change-Id: If6bb822fa55a0c477172348ea7dc10112c3b36df