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

Change-Id: I6a847b05a78e20680dfb4c55c1698a692a89a6b1