[automerger skipped] Merge "Shorten safe mode timer in VCN test mode" am:...

[automerger skipped] Merge "Shorten safe mode timer in VCN test mode" am: 3923c3ac am: 9ddc8bfd -s ours am: f4b9f315 -s ours

am skip reason: Merged-In Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44 with SHA-1 dc005a05 is already in history

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

Change-Id: I354b3ba4dccb5f63e0408597aaad3af873035c3a