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

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

Change-Id: I6d86cccb73a8608cb9d48b126ae7da8c7dc49de1