Merge "Change the default package license to Apache-2.0 and remove the...

Merge "Change the default package license to Apache-2.0 and remove the Android.mk." into main am: 7aabac2b am: 45f7be41

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2980340



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