[automerger skipped] NOT_VCN_MANAGED - do not use on Android R am: 36ed014487 am: c15d8d3d24 am: 49934a20f6 -s ours

am skip reason: Change-Id I14be7fb2395100c1d9c2b2b518538af6d5d8c1fd with SHA-1 1159d7052e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1574140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0519a1daf2c9f51826e6b0a5401bd5aa718db1d7