Merge "Shorten safe mode timer in VCN test mode" into sc-dev am: 6ad35a74 am: e9c9dbd1 am: 6ce7d5c9

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

Change-Id: I0a2f59efa05b211301a090e3cbea1a4f475b6975