Merge "Fix Typo in CellIdentityNr" am: 4e8328c972 am: 6804e518ab

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691212

Change-Id: Ice68a8603d3413732413f309c84bd62d264afb01