Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28

Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763