Merge "Apply more generic AIDL package name on jarjar rule." am: 3c3baf163a am: e3fc8eed91 am: 433df1fa70 am: 6f947a4aab

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

Change-Id: I0a020c20b420f6bd12918c276a6e0014c8c2ff24