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