tree 90d8061def99099e464e6d125efd08f3bc13f246
parent d114cd412dec97ebef0a0abbc9733ab629a46a1f
parent 94724bacecf0b754d55890085892dc4ec5231eda
author Mark Chien <markchien@google.com> 1597744557 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597744557 +0000

Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716 am: 36fd800cb1 am: 94724bacec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: I2ca525b77ef8b5968ae8effe9518ecb381b06b97