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

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

Change-Id: I829ec9e675eed0d5eddd7b0d374ed1df086c6731
tree: 7ca3837df20bdc5bd2a9343161fa3c261ad90b69
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg