Android R Beta 3
Merge "Add METADATA to nist-sip: contains Apache2=NOTICE" am: 54222ef2ef

Change-Id: If353a70dc4007333540e91203c44af5e78f095ef