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

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

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