Merge "Add a Constant for CellInfo#UNAVAILABLE_LONG" am: 572b1ee84b am: 51735ba270
am: 8502172502

Change-Id: Ib12baf92ef3315cb9c1dc8365f0f0aa0bb725dd1