Merge "Merge "Replace filegroup with aidl_library module type" am: 3c0960d6...

Merge "Merge "Replace filegroup with aidl_library module type" am: 3c0960d6 am: a9779031 am: 3775ab66" into udc-dev-plus-aosp am: 06679f55

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



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