tree fe068bb5da40129a7616077dc6f5a26bfa82bd44
parent 37fbe0090a98013b197e9cd703c4a743df947378
parent d5997fad372e6b9989f816fed1519d45ed32a249
author Xin Li <delphij@google.com> 1591631804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631804 +0000

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

am skip reason: Change-Id I166f80c6b6820c5be6f8a1139176a8f149a5e753 with SHA-1 37fbe0090a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/1323640

Change-Id: I2e50098bfc38ff7ba909974d7b1b98a4401a91c1