Merge "Keep screen on when user undims it manually" into sc-qpr1-dev am:...

Merge "Keep screen on when user undims it manually" into sc-qpr1-dev am: 103062f1 am: 68f9a715 am: 9ae6d152

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

Change-Id: Ibc9e7df99875dfff809a2eacf550961cd8473568