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

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



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