[automerger skipped] [nearby] Sync discoveryTimestamp field name am: 64e14583cc am: 704ca5c767 am: 951e56b7d5 -s ours

am skip reason: Merged-In I96e03660dbd49f361a436276d62473504f88d657 with SHA-1 d6acb0655f is already in history

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

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