Merge "Remove framework-aidl-mappings" am: e492ec434d am: 44f83d814d

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

Change-Id: I07851033049f9b90706103da566472df06c13aeb