Merge "Fix out of sync sysprop flag for backlight animation" into udc-qpr-dev am: 914e1547

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



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