tree 503037801c1358fa4e40ca8680389cdbb70acb81
parent 5d28ec6c7b8e768e177754a9baca625ff081fdbe
parent 6614ddfc8e030452a1e8c7a527bbad34bc45469c
author Xiao Ma <xiaom@google.com> 1603953741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603953741 +0000

Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: ac212e9807 am: 6614ddfc8e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1471583

Change-Id: I55ad41d32bc69dfcf946c82b3e9a9f755e2c81d9