Merge "Backwards-incompatible resolv module API change for making...
Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: 59d33238 am: 1d6c7482
am: 23752d47
Change-Id: Ia52b06a0622877d242cfd0488b9f715eef25ad3d