[automerger skipped] RESTRICT AUTOMERGE Force screen freezing timeout to unfreeze am: 1c101906a9 am: fe601c8229 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21809542 Change-Id: Ibaa6bb126538b1dc0f2036bc4c86def3cd9f1328 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: