Merge "disable dimming on display1" into tm-qpr-dev am: e64606ae07 am: f597087204

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21466174

Change-Id: I82bff2be76350e094f2ddb1f600d2c8e7f0bfb88
Signed-off-by: Automerger Merge Worker <[email protected]>