Merge "Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad" into stage-aosp-master am: 324ee26278 am: ed241470c6

Change-Id: I9de5a36c7928d0615cb620ef1a7a8f054dde9f98