Merge "Add mTimeStamp to SignalStrength"
am: aa5b09f6ad

Change-Id: I77ded661edc7fc2f0fbc10bb8b4c39f10000553d