Merge "Align the time of bssid comparison to avoid NPE caused by value changes." into main am: 670d3ff092

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865336

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