[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 skip reason: subject contains skip directive

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



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