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

Change-Id: I1921fa9611b2222228667bd55e6ac4df5b19a83a