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: Ied57374c3d41a61a40b06518e1f8676c09a7c4e9
tree: 6e059f933c9460719f34ded927c57f2d51a78c3e
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg