[automerger skipped] Merge "Support CellInfoNr in LocaleTracker." am:...
[automerger skipped] Merge "Support CellInfoNr in LocaleTracker." am: 14a85344 am: 2637b0c0 -s ours am: fd7814e8 -s ours
am skip reason: Change-Id If2aecd500e945c48b443ae9e7841cc8945603fde with SHA-1 7eed64cc is in history
Change-Id: If69a14ec6cc90c6160917ca37d0d878964af006b