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: ba829430 am: a544af01

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

Change-Id: I443672a652c9250b6e2623545ac91246f922035c