[automerger skipped] Merge Android R am: eaf7c4998d -s ours am: 6e443b4c5c -s ours am: aebebdae3b -s ours

am skip reason: Change-Id I3b0a326c6381091e8721811fb5ea352e6af1031f with SHA-1 7e90494ad7 is in history

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/1422486

Change-Id: I98ee4079a256271516ff8db30b1c3c69cd342258