Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad

Change-Id: I3f967b8eb3687550ada6b83ec18383ef92267017