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

Change-Id: I6dc9029af0df0d3b391210bd315516bdf1b5e4c9