Merge changes from topic "sap_blocked_list_enhancement" into rvc-dev am: 210f9b79c9

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

Change-Id: If8a0f042fbfcf6b89efaae05384f41e8710c348c
tree: 7105bb0c0df98aaf062973ebb740bc841b71b974
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg