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: I09b51d802c3ee6e535ae2b6b27d8373062b1dfc8
tree: c0e623938c08125cb30848fcf1a8876f85c34646
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg