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

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

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