[automerger skipped] Merge changes Ie1645eed,I91832784,I6bdf56b1 into mainline-prod am: f19909db20 -s ours

am skip reason: Change-Id Ie1645eedf3e3d6e55e02bdb507591cd74fe843bc with SHA-1 28cfd89833 is in history

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

Change-Id: I06fec6681702c9abb3c9d8c1b3268c178c3db3c6
tree: 926e1a91746a92f2558fa8418bc7c74b7045f903
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg