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

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

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