[automerger skipped] Merge "Add a flag for VCN safe mode configurability" into...

[automerger skipped] Merge "Add a flag for VCN safe mode configurability" into main am: 0f5e85a7 am: fd6f2cbd -s ours

am skip reason: Merged-In I4a54445a4238c81a409604be16c90ef341eed638 with SHA-1 d3c353fb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2803262



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