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

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

Change-Id: I27dfc300108e8788a9deaadde6af393447d5a0e7