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

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

Change-Id: I0069129c652a942ccc0a95b9276b7e0a6b05540e