Merge "Fix quickly toggling airplane mode on then off could leave Wifi disabled" into rvc-dev am: b76eb72b24 am: 2d7d20c9da am: 7e6e969fc4

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

Change-Id: Iaaab89919af985be24deb5c5b5ee7587cb08d50b
tree: a6fdea41d1e7efafedde4aea6185e630837688c5
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg