[automerger skipped] Don't overwrite in-use Weaver slots during VTS am: 86b9048544 am: 48325db6c8 am: 7dd5fb08a2 -s ours am: c7533d9726 -s ours

am skip reason: Merged-In Id2cce4240d68999471e7d1e8fc7a8449587eed97 with SHA-1 86b9048544 is already in history

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

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