Merge "Revert "Revert "Add license metadata to non-module targets.""" am: 01cd913312 am: b69a8ac2ea

Original change: https://android-review.googlesource.com/c/platform/development/+/2215211

Change-Id: I618d5f00e344c01c69ff7e5c4a2d8d93fd21d130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>