Merge "Respect caller config to disable VCN safe mode" into main am: ace49e05c5 am: 9754eccd82

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

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