Merge "Add a flag for VCN safe mode configurability" into main am: 0f5e85a7a4 am: 6b002010c9

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

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