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

Change-Id: Id1b891410408ad1c7f81af576d9673b2663d90fd