[resolved conflict] Merge "Remove _light / _dark / from "fixed" sys resources"...

[resolved conflict] Merge "Remove _light / _dark / from "fixed" sys resources" into udc-dev am: c6c42579

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



RESOURCES_FINALIZATION=Merge conflict, no actual diff

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