[nearby] Add discoveryTimestamp field am: a34d7e8949 am: 4c0aa8bf15

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

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

nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java

@@ -350,7 +350,10 @@ public class ChreDiscoveryProvider extends AbstractDiscoveryProvider {
                                             DataElement.DataType.ACTION,
                                             new byte[]{(byte) filterResult.getIntent()}));
                         }
-
+                        if (filterResult.hasDiscoveryTimestamp()) {
+                            presenceDeviceBuilder.setDiscoveryTimestampMillis(
+                                    filterResult.getDiscoveryTimestamp());
+                        }
                         PublicCredential publicCredential =
                                 new PublicCredential.Builder(
                                         secretId,

nearby/service/proto/src/presence/blefilter.proto

@@ -115,6 +115,7 @@ message BleFilterResult {
   repeated DataElement data_element = 7;
   optional bytes ble_service_data = 8;
   optional ResultType result_type = 9;
+  optional uint64 discovery_timestamp = 10; // Timestamp when the device is discovered.
 }
 
 message BleFilterResults {

nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java

@@ -262,6 +262,7 @@ public class ChreDiscoveryProviderTest {
                                 .setValue(ByteString.copyFrom(testData))
                                 .setValueLength(testData.length)
                         )
+                        .setDiscoveryTimestamp(1697765417070L)
                         .build();
         Blefilter.BleFilterResults results =
                 Blefilter.BleFilterResults.newBuilder().addResult(result).build();