[automerger skipped] Merge "Revert "Remove _light / _dark / from "fixed" sys...

[automerger skipped] Merge "Revert "Remove _light / _dark / from "fixed" sys resources"" into udc-dev am: 5c3928ac am: b93515e2 -s ours

am skip reason: Merged-In I834cb61b87fe98e65534fbd30baa17fa348ac6a9 with SHA-1 00c774e8 is already in history. Merged-In was found from reverted change.

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

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



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