Merge "Fix NPE in BssidBlocklistMonitor" into rvc-dev am: c5084bbfcb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11904318

Change-Id: Ie0e66463eca434cd5f1db6d9836b3d7663cf9ae5
tree: c3fb21659108c8e742e94280c6d7233e95c71473
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg