Merge "Fix Binder Crash due to CellInfo Timeout"
am: cfbc9559ce

Change-Id: Iec5c1b3b867b11f5ca6b064bd2bb2d36524e4171