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

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

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