Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad am: 7a3082f680

Change-Id: Ieed00f05b7feb5da3fd0970e6a213d83f860a4e6