[automerger skipped] Merge QQ3A.200605.002 into master am: ab00eb9578 -s ours

am skip reason: Change-Id I2c9fd1e7b471bd2f75d326372aeae02f593ae769 with SHA-1 a5df16eb61 is in history

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

Change-Id: Ibef997812f7328eefd932f22934a4344bdd4ad24
tree: 01000fd4e365d54bd3e7a8adf02bef9c505c84c1
  1. service/
  2. PREUPLOAD.cfg