Android R Beta 2
Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a

Change-Id: If85881f9aab7b3ac7e710f21e2f8b9b81639a791