Merge "[automerger skipped] Merge "Move alpha long/short to the base...
Merge "[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am: b57de562 am: a2a3815e -s ours" into pi-dev-plus-aosp
am: 0fa5e957 -s ours
Change-Id: I0bc3f370d164e08dfd101b8dbfd97d037be24d8d