[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2b7f1ef3a5 -s ours am: 8a5705fa7c -s ours

am skip reason: Merged-In I48a74533dde2264dd5d3c16fa40e8ea5853edd2e with SHA-1 0f42fa9982 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cachetools/+/16843727

Change-Id: I2dd3f681340a50a1cab60575a7bb49533b7d06f3