[automerger skipped] Don't overwrite in-use Weaver slots during VTS am: 86b9048544 am: 48325db6c8 -s ours am: 92863c5cb4 -s ours am: 08214517c8 -s ours

am skip reason: Merged-In Id2cce4240d68999471e7d1e8fc7a8449587eed97 with SHA-1 31380e7bc9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24151703

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