Merge "Remove Hidden TimestampType From CellInfo"
am: c65e610c06

Change-Id: I35c5c5e113d2c4c2c94fbf06dc498cbe12779ea4