Merge "Add 5G NR cellInfo" am: 4a7a3934b6
am: 89d69159c9

Change-Id: I28b7d4f95923d12919aa6946cafe1bf5a919db20