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

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

Change-Id: Ibfd085b283caf6a531cbdf752e009317eb105287
tree: bcc9585aa7c9165115000e327c42bafb22bc0ab2
  1. framework/
  2. OsuLogin/
  3. OWNERS