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

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

Change-Id: I3555051d368ff961462a5898a2e3c67a0afa7056