[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: 6b002010 am: 3488c504 -s ours

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

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



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