[automerger skipped] Merge changes from topic "NetworkAgent02" am: 31e7ebdd...

[automerger skipped] Merge changes from topic "NetworkAgent02" am: 31e7ebdd am: bc5395e4 am: 06165260 -s ours am: f076e684 -s ours am: 188d9330 -s ours

am skip reason: Merged-In Ie0fd5ba816c390bfb7bc6512d896a88482c217ec with SHA-1 37dff3b2 is already in history

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

Change-Id: I8ad1adecf5a4ae26d9de0178a2e03dad23213247