[automerger skipped] Mark RP1A.200720.001 as merged am: e58f6664 -s ours am:...

[automerger skipped] Mark RP1A.200720.001 as merged am: e58f6664 -s ours am: bcc19235 -s ours am: 53f9c900 -s ours

am skip reason: Change-Id I75fc4750a6ee2712dab7fb1401a3064f5ab65c27 with SHA-1 a0779c5b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/12514119

Change-Id: I3cb70c8a6dfa65ab4ef7794f479b6ceb7bd8cc4b