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

Merge "Replace filegroup with aidl_library module type" am: 3c0960d6 am: a9779031 am: 3775ab66

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



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