[automerger skipped] Merge "Set jni_uses_sdk_apis for NetworkStackTests" am:...
[automerger skipped] Merge "Set jni_uses_sdk_apis for NetworkStackTests" am: ac7d9c6c am: 9b376a79 -s ours
am skip reason: Change-Id Ieff8acec71d206104033a04c049840fd94adfce9 with SHA-1 a5e9fe81 is in history
Change-Id: I080b32bf5b75a01bdbb080e455575d67330a940c