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

Change-Id: I560e80cf4ac74bb7714d5a9da033249841dbd83d