[automerger skipped] Merge "Add 5G NR cellInfo" am: 4a7a3934b6 am: 89d69159c9
am: 275161b420  -s ours

Change-Id: Ice36992018416e9ef71101bca0a346d6f7f4036f