Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 7f5a15173a am: aa24ca0106 am: c9d181a3e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: I38ca7a3d1a07d511d99beb9fbe3eb48b265d40e9
tree: 8c986587e72de849aad48785c14e5c5a9cd8f82b
  1. framework/
  2. OsuLogin/
  3. OWNERS