[automerger skipped] Multi-Plmn and CSG Support For CellInfo am: 955614761c am: 9e1b398d44 am: 6fc8ead685 -s ours
am skip reason: Change-Id Iffd9351d2170a496639eced2c4618819f522494c with SHA-1 ac37b6344d is in history

Change-Id: I9f23eb07c789feab8674cea9246e76ea8653be73