[automerger skipped] [nearby] Add discoveryTimestamp field am: a34d7e8949 am: 4c0aa8bf15 am: fdb35e019b -s ours

am skip reason: Merged-In I2151cdeceec1a3180c79b0ea10adb6e5581f4845 with SHA-1 730894831d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871218

Change-Id: Ic1e4346ed370b250524a6bebb0788a35c99d5bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>