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

Change-Id: Iadd7d46833c99f17704586756fbc6358bb22e307