[automerger skipped] Merge "RESTRICT AUTOMERGE Force screen freezing timeout...

[automerger skipped] Merge "RESTRICT AUTOMERGE Force screen freezing timeout to unfreeze" into tm-qpr-dev am: 3222c826 am: b0becbbd -s ours am: f8916753 -s ours am: c08a95d7 -s ours

am skip reason: subject contains skip directive

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



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