[automerger skipped] Merge "Move power button cooldown period flag to Settings.Global" into sc-v2-dev am: e8d0b6bdca am: 9f051268e7 -s ours

am skip reason: Merged-In Icb977d9a7591ffe48ae44bbe2ad521945b7b0139 with SHA-1 5ab8466005 is already in history

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

Change-Id: Ia8af84df2dfef875ac638d395fee587862366c1f
This commit is contained in:
Patrick Huang
2022-02-01 18:31:34 +00:00
committed by Automerger Merge Worker

Diff Content Not Available