tree d99021b2e4f48bda3f2ab7e1ccc5d373bad67fa4
parent 1f081d34bdc0b13eb8edf62fa4ad7007d3a01391
parent 36d41a9ae4aa3d63a2d3117dffbcb2761b030004
author Jack Yu <jackyu@google.com> 1543854512 -0800
committer android-build-merger <android-build-merger@google.com> 1543854512 -0800

[automerger skipped] Merge "Fixed race condition in data connection" am: 08f0b659ac am: fbbc4af767
am: 36d41a9ae4  -s ours

Change-Id: Ia9f2061708e6ecb927f7d83e02ad61e82e9289bb