Merge "Restored 'maxConnsTime' and 'maxConns' in data profile"
authorJack Yu <jackyu@google.com>
Tue, 16 Oct 2018 01:20:47 +0000 (18:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Oct 2018 01:20:47 +0000 (18:20 -0700)
am: bcb0c1b49a

Change-Id: I376197118faadef4175ed97be87ed50b4573e919


Trivial merge