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

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

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