[automerger skipped] Extract PLMN from Voice CellIdentity for Locale am: 1dbda495 am: 218d09f9
am: e5b0f4d0 -s ours
am skip reason: change_id I634aeb9fb95cc361b21b79f209a90dddf18f5896 with SHA1 09ee2e53 is in history
Change-Id: I5cf9eaf34468b6605fdd03db42214f2b17d4cd52