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

Change-Id: I0a77e0367a846ce03f2eea639026d1fb8afdacda