Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 am: bc5395e42a

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

Change-Id: If099f376bfd5d456e938612005c4008b0beae91a