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

Change-Id: I027859db38d612558a7e7b3e3078230310b38984