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

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

Change-Id: I596750455252eae39f4b8877f6100e88a7e30e4a
tree: 20c3694e52c4a4a6e3804cf0b0bced8965ca1027
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg