Merge "Align the time of bssid comparison to avoid NPE caused by value...

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

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



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