Merge upstream v_2.0.12 into main am: db1c67ccaa

Original change: https://android-review.googlesource.com/c/platform/external/slf4j/+/2966247

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