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

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

Change-Id: I4c9599ca4017f061e857d5c00f651f4ea6c81309