Merge "Add METADATA to system/security: Apache2+BSD=NOTICE" am: e3541e4d06

Change-Id: I2ff04b88683d6b8924c0cd723cd236555e9a0048