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