Merge inital Google commit into Android main am: c089ad6c08 am: bcaa09e8d4

Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904650

Change-Id: I7b47a1b1a72846029a5d85364af3a2e8fc3d2309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>