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

Change-Id: I429437f3f4c6f5159be907c287a9d59bceb537a5