Merge changes I3e31fe72,I3fb0484c into rvc-dev am: 4d27af7b46

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

Change-Id: I040220328ef346fd1b8a9282b72241e322de5d05
tree: 60938ef0914afb8b06bacf775c0188bbff8aaf39
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg