Merge "HAL change for 5G NSA only" am: bfdbd58097
am: ca3f83dd20

Change-Id: I154780f67452964aaa0546c33e7c08622b32bdd9