Merge "Shorten safe mode timer in VCN test mode" into sc-dev am: 6ad35a74 am: ffb5f1ff am: 478ebe91

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

Change-Id: Ie12784103b604277c53bc6fd24d0a749318dcaa2