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

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

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