[automerger skipped] [NS06] Implement the don't-reap mechanism am: 947acd4275 am: f7fc878b82 -s ours am: 9a9ab04661 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723142
Change-Id: I966bb9f5b5d24f69e81f5fcd50052eb49af35d8a
This commit is contained in: