Merge "Keep screen on when user undims it manually" into sc-qpr1-dev am: 103062f1d8 am: 68f9a71509

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

Change-Id: I9ffa0a5f50ce47f9590d5f7f3859b71d999dc1a9