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