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

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



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