Merge "Set burn-in offsets to 0 if darkAmount=0" into tm-dev am: a3193ed1...

Merge "Set burn-in offsets to 0 if darkAmount=0" into tm-dev am: a3193ed1 am: 8e96c8fc am: 6462aa39

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



Change-Id: Iddd719090a69579884a03b462d867d0f136598b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>