[automerger skipped] Merge "Added NGRAN support to transport manager" am:...
[automerger skipped] Merge "Added NGRAN support to transport manager" am: c8fed0fd am: 2236bc7c -s ours am: 29e419d5 -s ours
am skip reason: Change-Id I4c0a97e1090f8a835441cb5e903c3ee78c30a926 with SHA-1 a9342a38 is in history
Change-Id: Ic2c84b8d874518b40841bd030f1bdc5e9bc20a25