[automerger skipped] Merge "Use flag to control the restart period value."...

[automerger skipped] Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81 am: 276862cf -s ours am: e5f832f8 -s ours am: bc94d30a -s ours

am skip reason: Merged-In Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb with SHA-1 46e69448 is already in history

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



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