tree 6e1ac190ac1f1237705c177d76c3930f07494474
parent 441c5bc2e829cea6aef1a325a1ff2b6342ec414b
parent 63b234d1582cd59d65328c7edb2805048712af46
author Chalard Jean <jchalard@google.com> 1603978239 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603978239 +0000

Merge "Fix a bug where modern network agents start in UNKNOWN" am: fc2b39948c am: 63b234d158

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

Change-Id: I1acdfe14a14bfca15967efe2d97b653691e259f8