Merge changes from topic "NetworkAgent02" am: 8539ed6fd2 am: b1d27c29ff

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

Change-Id: If099f376bfd5d456e938612005c4008b0beae91a