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

am skip reason: skip tag Change-Id Ie0fd5ba816c390bfb7bc6512d896a88482c217ec with SHA-1 37dff3b2 is already in history

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

Change-Id: Ie95c3a94fa2a7e730ad43fa545dc82cf20c0e1bd