[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: da57e74785 -s ours am: db2ee36dfd -s ours

am skip reason: Merged-In Ie725d5458046c31cb851c15be35c8349423fb0d1 with SHA-1 8ddc51b2ee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/librustutils/+/16279077

Change-Id: I7deb5271d3d6e248a32e0436b28d561e957b5682