Merge remote-tracking branch 'aosp/upstream-master' am: d7dff33e9c

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

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