Merge "Add 5G rat type" am: 8f9f382c9c
am: 411ea19296

Change-Id: Ie9cdb0b41815b7ed70c4d568d0eaf4dd9ab047e9