tree bba9a71f1bbf2463f1f45ed1f81c12d788042f28
parent a9192f82960547dc76d327f5760f94555327e3c1
parent b6c257d37fdf8d906eb010702bbdf2e3e65b7ba1
author Xin Li <delphij@google.com> 1633681782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681782 +0000

[automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours am: ad3c475452 -s ours am: 20bdf84535 -s ours am: b6c257d37f -s ours

am skip reason: Merged-In I9d1b60b1bddeade81238cc971d38a5de76f748d5 with SHA-1 af91a5ec2d is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1848033

Change-Id: Ifc9d23b7169673fbe861f25d02483bbceaf55d4b