Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev