[automerger skipped] Merge QQ3A.200605.002 into master am: d5997fad37 -s ours am: 4c4eea7c1c -s ours am: b3fb8e6e10 -s ours am: 0ce5ded75d -s ours am: 4b050de5e8 -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: Ia2b31ae5db3802215f7d36e14b25802787c88df0