Merge "Expose DhcpInfo parcelable interface implementation methods" am: 44780ff920 am: 19c2ed44ea

Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3