Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: 59d332387c am: 1d6c748213
am: 23752d475a

Change-Id: Ia52b06a0622877d242cfd0488b9f715eef25ad3d