Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6

Change-Id: I4cdc9dfbb0f311f90f8599c477ac71578f96b94d