am 87abf00d: Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev

* commit '87abf00d2fe3cfe14cbcb7e6bfa9d60e340efc5b':
  Revert "Revert "CTS for timestamp in ScanResult""