[automerger skipped] Merge "BACKPORT: Add CTS for CellInfoNr" am: 72dc326d29 am: 12f17ae054
am: 7c6e1ea6e9 -s ours
am skip reason: change_id Idb7ff676b646f7b47914dfd2d0bf21cad02111df with SHA1 d5153e71af is in history

Change-Id: I3c6faefe7ee2635a09cba4ebd35da3c8060cb2d9