Merge mainline-release 6664920 to master - DO NOT MERGE am: 5e95ddcc17

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

Change-Id: I0140df054ce4c44513f6dc4beecb62126a959075
tree: 8ee914fb9bae7b4cb91e969275eeb4fad0ab08e9
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg