Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.
Test: Manual
bug: 63633916
Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
(cherry picked from commit 5523dc55d8)