Merge "Support adjustable VCN safe mode timeout" into main am: c3cf43753c am: 1f093250fd am: 5ee50f36de

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

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