Merge "Apply more generic AIDL package name on jarjar rule." am: 3c3baf163a am: e3fc8eed91 am: 15003fa4b9 am: 9531c63c82

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

Change-Id: I0a020c20b420f6bd12918c276a6e0014c8c2ff24
tree: 9515d44324e5ab8ffb8da15ea5ec716e93de26e1
  1. framework/
  2. OsuLogin/
  3. OWNERS