[automerger skipped] Merge "Auto-generate list of module impl jars" am:...

[automerger skipped] Merge "Auto-generate list of module impl jars" am: 9a4e4e91 am: d5da9cee am: 061c23ea am: b556470d -s ours

am skip reason: Merged-In Ia8627c6e3977cd271e389ec482388ff73661881d with SHA-1 23274eef is already in history

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

Change-Id: I218737c835ccc67bc9ef26fd94e405f248a91f12