Merge tag 'upstream/1.2.1' into master am: 72f4997c35 am: eb09069d46

Original change: https://android-review.googlesource.com/c/platform/external/bazel-skylib/+/2132643

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